From 3b9bd03d4124eeea3ac90b699d2c3f00cab26f21 Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Sun, 16 Oct 2022 23:36:46 -0400
Subject: [PATCH 001/109] add async deps

---
 setup.cfg | 2 ++
 tox.ini   | 1 +
 2 files changed, 3 insertions(+)

diff --git a/setup.cfg b/setup.cfg
index 531731df..c6f4a39c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -23,6 +23,8 @@ package_dir =
 python_requires = >=3.7
 
 install_requires =
+    anyio>=3.6.1
+    asyncclick>=8.1.3.4
     click>=8.0,<9.0
     importlib-metadata>=4.0
     python-dotenv>=0.19.2
diff --git a/tox.ini b/tox.ini
index 1966f075..208b324f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,6 +14,7 @@ passenv =
 extras =
     testing
 deps =
+    asyncclick>=8.1.3.4
     cairo-lang==0.10.0
     starknet-devnet==0.3.1
     # See https://github.com/starkware-libs/cairo-lang/issues/52

From 31faeb422cd8412c0e6db57ee651923f5d50d785 Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Sun, 16 Oct 2022 23:37:11 -0400
Subject: [PATCH 002/109] update funcs to async

---
 src/nile/cli.py | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/nile/cli.py b/src/nile/cli.py
index ac3764bc..96efa255 100755
--- a/src/nile/cli.py
+++ b/src/nile/cli.py
@@ -2,7 +2,7 @@
 """Nile CLI entry point."""
 import logging
 
-import click
+import asyncclick as click
 
 from nile.common import is_alias
 from nile.core.account import Account
@@ -89,9 +89,9 @@ def run(path, network):
 @network_option
 @click.option("--alias")
 @click.option("--abi")
-def deploy(artifact, arguments, network, alias, abi=None):
+async def deploy(artifact, arguments, network, alias, abi=None):
     """Deploy StarkNet smart contract."""
-    deploy_command(artifact, arguments, network, alias, abi=abi)
+    await deploy_command(artifact, arguments, network, alias, abi=abi)
 
 
 @cli.command()
@@ -106,9 +106,9 @@ def declare(artifact, network, alias):
 @cli.command()
 @click.argument("signer", nargs=1)
 @network_option
-def setup(signer, network):
+async def setup(signer, network):
     """Set up an Account contract."""
-    Account(signer, network)
+    await Account(signer, network)
 
 
 @cli.command()
@@ -118,9 +118,9 @@ def setup(signer, network):
 @click.argument("params", nargs=-1)
 @click.option("--max_fee", nargs=1)
 @network_option
-def send(signer, address_or_alias, method, params, network, max_fee=None):
+async def send(signer, address_or_alias, method, params, network, max_fee=None):
     """Invoke a contract's method through an Account. Same usage as nile invoke."""
-    account = Account(signer, network)
+    account = await Account(signer, network)
     print(
         "Calling {} on {} with params: {}".format(
             method, address_or_alias, [x for x in params]
@@ -128,7 +128,7 @@ def send(signer, address_or_alias, method, params, network, max_fee=None):
     )
     # address_or_alias is not normalized first here because
     # Account.send is part of Nile's public API and can accept hex addresses
-    out = account.send(address_or_alias, method, params, max_fee=max_fee)
+    out = await account.send(address_or_alias, method, params, max_fee=max_fee)
     print(out)
 
 
@@ -154,11 +154,11 @@ def invoke(address_or_alias, method, params, network, max_fee=None):
 @click.argument("method", nargs=1)
 @click.argument("params", nargs=-1)
 @network_option
-def call(address_or_alias, method, params, network):
+async def call(address_or_alias, method, params, network):
     """Call functions of StarkNet smart contracts."""
     if not is_alias(address_or_alias):
         address_or_alias = normalize_number(address_or_alias)
-    out = call_or_invoke_command(address_or_alias, "call", method, params, network)
+    out = await call_or_invoke_command(address_or_alias, "call", method, params, network)
     print(out)
 
 
@@ -269,4 +269,4 @@ def get_nonce(contract_address, network):
 
 
 if __name__ == "__main__":
-    cli()
+    cli(_anyion_backend="asyncio")

From 4313220b4d4db05e91bccaea7392c7cdd6472f11 Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Sun, 16 Oct 2022 23:38:00 -0400
Subject: [PATCH 003/109] adjust run_cmd, add helper funcs

---
 src/nile/common.py | 51 +++++++++++++++++++++++++++++++++++-----------
 1 file changed, 39 insertions(+), 12 deletions(-)

diff --git a/src/nile/common.py b/src/nile/common.py
index 0f739c23..1682643e 100644
--- a/src/nile/common.py
+++ b/src/nile/common.py
@@ -1,8 +1,12 @@
 """nile common module."""
 import json
+import io
 import os
 import re
-import subprocess
+import argparse
+import sys
+
+from starkware.starknet.cli.starknet_cli import NETWORKS, deploy
 
 from nile.utils import normalize_number, str_to_felt
 
@@ -48,7 +52,7 @@ def get_all_contracts(ext=None, directory=None):
     return files
 
 
-def run_command(
+async def run_command(
     contract_name, network, overriding_path=None, operation="deploy", arguments=None
 ):
     """Execute CLI command with given parameters."""
@@ -56,22 +60,17 @@ def run_command(
         overriding_path if overriding_path else (BUILD_DIRECTORY, ABIS_DIRECTORY)
     )
     contract = f"{base_path[0]}/{contract_name}.json"
-    command = ["starknet", operation, "--contract", contract]
+    command = ["--contract", contract]
 
     if arguments:
         command.append("--inputs")
         command.extend(prepare_params(arguments))
 
-    if network == "mainnet":
-        os.environ["STARKNET_NETWORK"] = "alpha-mainnet"
-    elif network == "goerli":
-        os.environ["STARKNET_NETWORK"] = "alpha-goerli"
-    else:
-        command.append(f"--gateway_url={GATEWAYS.get(network)}")
-
-    command.append("--no_wallet")
+    args = argparse
+    args.wallet = ""
+    args.gateway_url = get_gateway_url(network)
 
-    return subprocess.check_output(command)
+    return await deploy(args=args, command_args=command)
 
 
 def parse_information(x):
@@ -122,3 +121,31 @@ def is_string(param):
 def is_alias(param):
     """Identiy param as alias (instead of address)."""
     return is_string(param)
+
+
+def get_gateway_url(network):
+    """Return gateway URL for specified network."""
+    if network == "localhost":
+        return GATEWAYS.get(network)
+    else:
+        network = "alpha-" + network
+        return f"https://{NETWORKS[network]}/gateway"
+
+
+def get_feeder_url(network):
+    """Return feeder gateway URL for specified network."""
+    if network == "localhost":
+        return GATEWAYS.get(network)
+    else:
+        network = "alpha-" + network
+        return f"https://{NETWORKS[network]}/feeder_gateway"
+
+
+async def capture_stdout(func):
+    """Return the stdout during the passed function call."""
+    stdout = sys.stdout
+    sys.stdout = io.StringIO()
+    await func
+    output = sys.stdout.getvalue()
+    sys.stdout = stdout
+    return output

From 4ee68d44dd19a7c57b4de98647181d5c277bdec6 Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Sun, 16 Oct 2022 23:38:45 -0400
Subject: [PATCH 004/109] adjust methods to async

---
 src/nile/core/account.py        | 28 +++++++++----
 src/nile/core/call_or_invoke.py | 74 +++++++++++++++++----------------
 src/nile/core/declare.py        |  8 ++--
 src/nile/core/deploy.py         | 15 +++++--
 4 files changed, 76 insertions(+), 49 deletions(-)

diff --git a/src/nile/core/account.py b/src/nile/core/account.py
index 0cb8f4ad..3f414e77 100644
--- a/src/nile/core/account.py
+++ b/src/nile/core/account.py
@@ -19,10 +19,24 @@
 load_dotenv()
 
 
-class Account:
+class AsyncObject(object):
+    """Base class for Account to allow async initialization."""
+
+    async def __new__(cls, *a, **kw):
+        """Return coroutine (not class so sync __init__ is not invoked)."""
+        instance = super().__new__(cls)
+        await instance.__init__(*a, **kw)
+        return instance
+
+    async def __init__(self):
+        """Support Account async __init__."""
+        pass
+
+
+class Account(AsyncObject):
     """Account contract abstraction."""
 
-    def __init__(self, signer, network, predeployed_info=None):
+    async def __init__(self, signer, network, predeployed_info=None):
         """Get or deploy an Account contract for the given private key."""
         try:
             if predeployed_info is None:
@@ -53,17 +67,17 @@ def __init__(self, signer, network, predeployed_info=None):
             self.address = signer_data["address"]
             self.index = signer_data["index"]
         else:
-            address, index = self.deploy()
+            address, index = await self.deploy()
             self.address = address
             self.index = index
 
-    def deploy(self):
+    async def deploy(self):
         """Deploy an Account contract for the given private key."""
         index = accounts.current_index(self.network)
         pt = os.path.dirname(os.path.realpath(__file__)).replace("/core", "")
         overriding_path = (f"{pt}/artifacts", f"{pt}/artifacts/abis")
 
-        address, _ = deploy(
+        address, _ = await deploy(
             "Account",
             [self.signer.public_key],
             self.network,
@@ -77,7 +91,7 @@ def deploy(self):
 
         return address, index
 
-    def send(self, address_or_alias, method, calldata, max_fee, nonce=None):
+    async def send(self, address_or_alias, method, calldata, max_fee, nonce=None):
         """Execute a tx going through an Account contract."""
         if not is_alias(address_or_alias):
             address_or_alias = normalize_number(address_or_alias)
@@ -104,7 +118,7 @@ def send(self, address_or_alias, method, calldata, max_fee, nonce=None):
             max_fee=max_fee,
         )
 
-        return call_or_invoke(
+        return await call_or_invoke(
             contract=self,
             type="invoke",
             method="__execute__",
diff --git a/src/nile/core/call_or_invoke.py b/src/nile/core/call_or_invoke.py
index 76ed6d19..52f93e9b 100644
--- a/src/nile/core/call_or_invoke.py
+++ b/src/nile/core/call_or_invoke.py
@@ -1,15 +1,14 @@
 """Command to call or invoke StarkNet smart contracts."""
+import argparse
 import logging
-import os
-import subprocess
 
 from nile import deployments
-from nile.common import GATEWAYS, prepare_params
+from nile.common import get_gateway_url, get_feeder_url, prepare_params, capture_stdout
 from nile.core import account
 from nile.utils import hex_address
+from starkware.starknet.cli.starknet_cli import call, invoke, AbiFormatError
 
-
-def call_or_invoke(
+async def call_or_invoke(
     contract, type, method, params, network, signature=None, max_fee=None
 ):
     """Call or invoke functions of StarkNet smart contracts."""
@@ -21,8 +20,6 @@ def call_or_invoke(
 
     address = hex_address(address)
     command = [
-        "starknet",
-        type,
         "--address",
         address,
         "--abi",
@@ -31,14 +28,6 @@ def call_or_invoke(
         method,
     ]
 
-    if network == "mainnet":
-        os.environ["STARKNET_NETWORK"] = "alpha-mainnet"
-    elif network == "goerli":
-        os.environ["STARKNET_NETWORK"] = "alpha-goerli"
-    else:
-        command.append(f"--feeder_gateway_url={GATEWAYS.get(network)}")
-        command.append(f"--gateway_url={GATEWAYS.get(network)}")
-
     params = prepare_params(params)
 
     if len(params) > 0:
@@ -53,26 +42,41 @@ def call_or_invoke(
         command.append("--max_fee")
         command.append(max_fee)
 
-    command.append("--no_wallet")
+    if type == "call":
+        try:
+            return await _call_command(command, network)
+        except AbiFormatError as err:
+            logging.error(err)
+
+    elif type == "invoke":
+        try:
+            return await _invoke_command(command, network)
+        except BaseException as err:
+            if "max_fee must be bigger than 0." in str(err):
+                logging.error(
+                    """
+                    \n😰 Whoops, looks like max fee is missing. Try with:\n
+                    --max_fee=`MAX_FEE`
+                    """
+                )
+
+async def _call_command(command, network):
+    args = argparse
+    args.feeder_gateway_url = get_feeder_url(network)
 
-    try:
-        return subprocess.check_output(command).strip().decode("utf-8")
-    except subprocess.CalledProcessError:
-        p = subprocess.Popen(command, stderr=subprocess.PIPE)
-        _, error = p.communicate()
-        err_msg = error.decode()
+    return await capture_stdout(
+        call(args=args, command_args=command)
+    )
 
-        if "max_fee must be bigger than 0" in err_msg:
-            logging.error(
-                """
-                \n😰 Whoops, looks like max fee is missing. Try with:\n
-                --max_fee=`MAX_FEE`
-                """
-            )
-        elif "transactions should go through the __execute__ entrypoint." in err_msg:
-            logging.error(
-                "\n\n😰 Whoops, looks like you're not using an account. Try with:\n"
-                "\nnile send [OPTIONS] SIGNER CONTRACT_NAME METHOD [PARAMS]"
-            )
+async def _invoke_command(command, network):
+    args = argparse
+    args.feeder_gateway_url = get_feeder_url(network)
+    args.gateway_url = get_gateway_url(network)
+    args.wallet = ""
+    args.network_id = network
+    args.account_dir = None
+    args.account = None
 
-        return ""
+    return await capture_stdout(
+        invoke(args=args, command_args=command)
+    )
diff --git a/src/nile/core/declare.py b/src/nile/core/declare.py
index 541ce079..c8be4430 100644
--- a/src/nile/core/declare.py
+++ b/src/nile/core/declare.py
@@ -2,10 +2,10 @@
 import logging
 
 from nile import deployments
-from nile.common import DECLARATIONS_FILENAME, parse_information, run_command
+from nile.common import DECLARATIONS_FILENAME, parse_information, run_command, capture_stdout
 
 
-def declare(contract_name, network, alias=None, overriding_path=None):
+async def declare(contract_name, network, alias=None, overriding_path=None):
     """Declare StarkNet smart contracts."""
     logging.info(f"🚀 Declaring {contract_name}")
 
@@ -13,7 +13,9 @@ def declare(contract_name, network, alias=None, overriding_path=None):
         file = f"{network}.{DECLARATIONS_FILENAME}"
         raise Exception(f"Alias {alias} already exists in {file}")
 
-    output = run_command(contract_name, network, overriding_path, operation="declare")
+    output = await capture_stdout(
+        run_command(contract_name, network, overriding_path, operation="declare")
+    )
     class_hash, tx_hash = parse_information(output)
     logging.info(
         f"⏳ Declaration of {contract_name} successfully sent at {hex(class_hash)}"
diff --git a/src/nile/core/deploy.py b/src/nile/core/deploy.py
index cf55fb6e..2e018bf5 100644
--- a/src/nile/core/deploy.py
+++ b/src/nile/core/deploy.py
@@ -1,20 +1,27 @@
 """Command to deploy StarkNet smart contracts."""
 import logging
+import sys
+import io
 
 from nile import deployments
-from nile.common import ABIS_DIRECTORY, BUILD_DIRECTORY, parse_information, run_command
+from nile.common import (
+    ABIS_DIRECTORY, BUILD_DIRECTORY, parse_information, run_command, capture_stdout
+)
 from nile.utils import hex_address
 
-
-def deploy(contract_name, arguments, network, alias, overriding_path=None, abi=None):
+async def deploy(contract_name, arguments, network, alias, overriding_path=None, abi=None):
     """Deploy StarkNet smart contracts."""
+
     logging.info(f"🚀 Deploying {contract_name}")
+
     base_path = (
         overriding_path if overriding_path else (BUILD_DIRECTORY, ABIS_DIRECTORY)
     )
     register_abi = abi if abi is not None else f"{base_path[1]}/{contract_name}.json"
 
-    output = run_command(contract_name, network, overriding_path, arguments=arguments)
+    output = await capture_stdout(
+        run_command(contract_name, network, overriding_path, arguments=arguments)
+    )
 
     address, tx_hash = parse_information(output)
     logging.info(

From 3c916bb0d164c19ad32432f0c4e9bebe131a94c4 Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Sun, 16 Oct 2022 23:39:09 -0400
Subject: [PATCH 005/109] adjust nre to async

---
 src/nile/core/run.py | 4 ++--
 src/nile/nre.py      | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/nile/core/run.py b/src/nile/core/run.py
index 431a878e..ec28efb7 100644
--- a/src/nile/core/run.py
+++ b/src/nile/core/run.py
@@ -5,10 +5,10 @@
 from nile.nre import NileRuntimeEnvironment
 
 
-def run(path, network):
+async def run(path, network):
     """Run nile scripts passing on the NRE object."""
     logger = logging.getLogger()
     logger.disabled = True
     script = SourceFileLoader("script", path).load_module()
     nre = NileRuntimeEnvironment(network)
-    script.run(nre)
+    await script.run(nre)
diff --git a/src/nile/nre.py b/src/nile/nre.py
index a85f0bfa..73ec9edd 100644
--- a/src/nile/nre.py
+++ b/src/nile/nre.py
@@ -41,9 +41,7 @@ def call(self, address_or_alias, method, params=None):
         """Call a view function in a smart contract."""
         if not is_alias(address_or_alias):
             address_or_alias = normalize_number(address_or_alias)
-        return str(
-            call_or_invoke(address_or_alias, "call", method, params, self.network)
-        ).split()
+        return call_or_invoke(address_or_alias, "call", method, params, self.network)
 
     def invoke(self, address_or_alias, method, params=None):
         """Invoke a mutable function in a smart contract."""

From 6d742af99200ea8981ff6d7d3f49181ccb1737b5 Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Sun, 16 Oct 2022 23:41:03 -0400
Subject: [PATCH 006/109] fix formatting

---
 src/nile/cli.py                 |  4 +++-
 src/nile/common.py              |  4 ++--
 src/nile/core/call_or_invoke.py | 16 ++++++++--------
 src/nile/core/declare.py        |  7 ++++++-
 src/nile/core/deploy.py         | 14 +++++++++-----
 5 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/src/nile/cli.py b/src/nile/cli.py
index 96efa255..b4d12ba3 100755
--- a/src/nile/cli.py
+++ b/src/nile/cli.py
@@ -158,7 +158,9 @@ async def call(address_or_alias, method, params, network):
     """Call functions of StarkNet smart contracts."""
     if not is_alias(address_or_alias):
         address_or_alias = normalize_number(address_or_alias)
-    out = await call_or_invoke_command(address_or_alias, "call", method, params, network)
+    out = await call_or_invoke_command(
+        address_or_alias, "call", method, params, network
+    )
     print(out)
 
 
diff --git a/src/nile/common.py b/src/nile/common.py
index 1682643e..e92679f9 100644
--- a/src/nile/common.py
+++ b/src/nile/common.py
@@ -1,9 +1,9 @@
 """nile common module."""
-import json
+import argparse
 import io
+import json
 import os
 import re
-import argparse
 import sys
 
 from starkware.starknet.cli.starknet_cli import NETWORKS, deploy
diff --git a/src/nile/core/call_or_invoke.py b/src/nile/core/call_or_invoke.py
index 52f93e9b..ee41ab91 100644
--- a/src/nile/core/call_or_invoke.py
+++ b/src/nile/core/call_or_invoke.py
@@ -2,11 +2,13 @@
 import argparse
 import logging
 
+from starkware.starknet.cli.starknet_cli import AbiFormatError, call, invoke
+
 from nile import deployments
-from nile.common import get_gateway_url, get_feeder_url, prepare_params, capture_stdout
+from nile.common import capture_stdout, get_feeder_url, get_gateway_url, prepare_params
 from nile.core import account
 from nile.utils import hex_address
-from starkware.starknet.cli.starknet_cli import call, invoke, AbiFormatError
+
 
 async def call_or_invoke(
     contract, type, method, params, network, signature=None, max_fee=None
@@ -60,13 +62,13 @@ async def call_or_invoke(
                     """
                 )
 
+
 async def _call_command(command, network):
     args = argparse
     args.feeder_gateway_url = get_feeder_url(network)
 
-    return await capture_stdout(
-        call(args=args, command_args=command)
-    )
+    return await capture_stdout(call(args=args, command_args=command))
+
 
 async def _invoke_command(command, network):
     args = argparse
@@ -77,6 +79,4 @@ async def _invoke_command(command, network):
     args.account_dir = None
     args.account = None
 
-    return await capture_stdout(
-        invoke(args=args, command_args=command)
-    )
+    return await capture_stdout(invoke(args=args, command_args=command))
diff --git a/src/nile/core/declare.py b/src/nile/core/declare.py
index c8be4430..6e2b5151 100644
--- a/src/nile/core/declare.py
+++ b/src/nile/core/declare.py
@@ -2,7 +2,12 @@
 import logging
 
 from nile import deployments
-from nile.common import DECLARATIONS_FILENAME, parse_information, run_command, capture_stdout
+from nile.common import (
+    DECLARATIONS_FILENAME,
+    capture_stdout,
+    parse_information,
+    run_command,
+)
 
 
 async def declare(contract_name, network, alias=None, overriding_path=None):
diff --git a/src/nile/core/deploy.py b/src/nile/core/deploy.py
index 2e018bf5..6a9bf617 100644
--- a/src/nile/core/deploy.py
+++ b/src/nile/core/deploy.py
@@ -1,17 +1,21 @@
 """Command to deploy StarkNet smart contracts."""
 import logging
-import sys
-import io
 
 from nile import deployments
 from nile.common import (
-    ABIS_DIRECTORY, BUILD_DIRECTORY, parse_information, run_command, capture_stdout
+    ABIS_DIRECTORY,
+    BUILD_DIRECTORY,
+    capture_stdout,
+    parse_information,
+    run_command,
 )
 from nile.utils import hex_address
 
-async def deploy(contract_name, arguments, network, alias, overriding_path=None, abi=None):
-    """Deploy StarkNet smart contracts."""
 
+async def deploy(
+    contract_name, arguments, network, alias, overriding_path=None, abi=None
+):
+    """Deploy StarkNet smart contracts."""
     logging.info(f"🚀 Deploying {contract_name}")
 
     base_path = (

From c47a75afbe079acee6060b471e5a49269ea9f889 Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Mon, 17 Oct 2022 15:36:36 -0400
Subject: [PATCH 007/109] replace arg object, fix nre and output

---
 src/nile/cli.py                 |  7 ++++---
 src/nile/common.py              | 11 +++++++++--
 src/nile/core/call_or_invoke.py | 17 +++++++++++------
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/nile/cli.py b/src/nile/cli.py
index b4d12ba3..91c82711 100755
--- a/src/nile/cli.py
+++ b/src/nile/cli.py
@@ -78,9 +78,9 @@ def install():
 @cli.command()
 @click.argument("path", nargs=1)
 @network_option
-def run(path, network):
+async def run(path, network):
     """Run Nile scripts with NileRuntimeEnvironment."""
-    run_command(path, network)
+    await run_command(path, network)
 
 
 @cli.command()
@@ -161,7 +161,8 @@ async def call(address_or_alias, method, params, network):
     out = await call_or_invoke_command(
         address_or_alias, "call", method, params, network
     )
-    print(out)
+    logging.info(out)
+    return out
 
 
 @cli.command()
diff --git a/src/nile/common.py b/src/nile/common.py
index e92679f9..f6faf10b 100644
--- a/src/nile/common.py
+++ b/src/nile/common.py
@@ -1,5 +1,4 @@
 """nile common module."""
-import argparse
 import io
 import json
 import os
@@ -66,7 +65,7 @@ async def run_command(
         command.append("--inputs")
         command.extend(prepare_params(arguments))
 
-    args = argparse
+    args = Args()
     args.wallet = ""
     args.gateway_url = get_gateway_url(network)
 
@@ -123,6 +122,14 @@ def is_alias(param):
     return is_string(param)
 
 
+class Args(dict):
+    """Helper class to mimic argparse dict."""
+    def __init__(self, *args, **kwargs):
+        """Instantiate class and key/value pairs through dot notation."""
+        super().__init__(*args, **kwargs)
+        self.__dict__ = self
+
+
 def get_gateway_url(network):
     """Return gateway URL for specified network."""
     if network == "localhost":
diff --git a/src/nile/core/call_or_invoke.py b/src/nile/core/call_or_invoke.py
index ee41ab91..dbdbd295 100644
--- a/src/nile/core/call_or_invoke.py
+++ b/src/nile/core/call_or_invoke.py
@@ -1,11 +1,10 @@
 """Command to call or invoke StarkNet smart contracts."""
-import argparse
 import logging
 
 from starkware.starknet.cli.starknet_cli import AbiFormatError, call, invoke
 
 from nile import deployments
-from nile.common import capture_stdout, get_feeder_url, get_gateway_url, prepare_params
+from nile.common import Args, capture_stdout, get_feeder_url, get_gateway_url, prepare_params
 from nile.core import account
 from nile.utils import hex_address
 
@@ -64,14 +63,17 @@ async def call_or_invoke(
 
 
 async def _call_command(command, network):
-    args = argparse
+    args = Args()
     args.feeder_gateway_url = get_feeder_url(network)
 
-    return await capture_stdout(call(args=args, command_args=command))
+    result = await capture_stdout(
+        call(args=args, command_args=command)
+    )
+    return result.rstrip()
 
 
 async def _invoke_command(command, network):
-    args = argparse
+    args = Args()
     args.feeder_gateway_url = get_feeder_url(network)
     args.gateway_url = get_gateway_url(network)
     args.wallet = ""
@@ -79,4 +81,7 @@ async def _invoke_command(command, network):
     args.account_dir = None
     args.account = None
 
-    return await capture_stdout(invoke(args=args, command_args=command))
+    result = await capture_stdout(
+        invoke(args=args, command_args=command)
+    )
+    return result.rstrip()

From 1fe7e8d51f885ae50ae837b94e73363504441cfd Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Mon, 17 Oct 2022 15:37:14 -0400
Subject: [PATCH 008/109] fix formatting

---
 src/nile/common.py              |  1 +
 src/nile/core/call_or_invoke.py | 16 +++++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/nile/common.py b/src/nile/common.py
index f6faf10b..42ef90f8 100644
--- a/src/nile/common.py
+++ b/src/nile/common.py
@@ -124,6 +124,7 @@ def is_alias(param):
 
 class Args(dict):
     """Helper class to mimic argparse dict."""
+
     def __init__(self, *args, **kwargs):
         """Instantiate class and key/value pairs through dot notation."""
         super().__init__(*args, **kwargs)
diff --git a/src/nile/core/call_or_invoke.py b/src/nile/core/call_or_invoke.py
index dbdbd295..4c9ebdc6 100644
--- a/src/nile/core/call_or_invoke.py
+++ b/src/nile/core/call_or_invoke.py
@@ -4,7 +4,13 @@
 from starkware.starknet.cli.starknet_cli import AbiFormatError, call, invoke
 
 from nile import deployments
-from nile.common import Args, capture_stdout, get_feeder_url, get_gateway_url, prepare_params
+from nile.common import (
+    Args,
+    capture_stdout,
+    get_feeder_url,
+    get_gateway_url,
+    prepare_params,
+)
 from nile.core import account
 from nile.utils import hex_address
 
@@ -66,9 +72,7 @@ async def _call_command(command, network):
     args = Args()
     args.feeder_gateway_url = get_feeder_url(network)
 
-    result = await capture_stdout(
-        call(args=args, command_args=command)
-    )
+    result = await capture_stdout(call(args=args, command_args=command))
     return result.rstrip()
 
 
@@ -81,7 +85,5 @@ async def _invoke_command(command, network):
     args.account_dir = None
     args.account = None
 
-    result = await capture_stdout(
-        invoke(args=args, command_args=command)
-    )
+    result = await capture_stdout(invoke(args=args, command_args=command))
     return result.rstrip()

From 0f5770ffdc3a3a6e7de0ef63b8837f5b1a89df5e Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Mon, 17 Oct 2022 20:48:03 -0400
Subject: [PATCH 009/109] add rstrip to capture

---
 src/nile/common.py              |  3 ++-
 src/nile/core/call_or_invoke.py | 10 ++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/nile/common.py b/src/nile/common.py
index 42ef90f8..c648a048 100644
--- a/src/nile/common.py
+++ b/src/nile/common.py
@@ -156,4 +156,5 @@ async def capture_stdout(func):
     await func
     output = sys.stdout.getvalue()
     sys.stdout = stdout
-    return output
+    result = output.rstrip()
+    return result
diff --git a/src/nile/core/call_or_invoke.py b/src/nile/core/call_or_invoke.py
index 4c9ebdc6..c1255651 100644
--- a/src/nile/core/call_or_invoke.py
+++ b/src/nile/core/call_or_invoke.py
@@ -66,14 +66,16 @@ async def call_or_invoke(
                     --max_fee=`MAX_FEE`
                     """
                 )
+            else:
+                raise err
 
 
 async def _call_command(command, network):
     args = Args()
     args.feeder_gateway_url = get_feeder_url(network)
 
-    result = await capture_stdout(call(args=args, command_args=command))
-    return result.rstrip()
+    return await capture_stdout(call(args=args, command_args=command))
+    #return result.rstrip()
 
 
 async def _invoke_command(command, network):
@@ -85,5 +87,5 @@ async def _invoke_command(command, network):
     args.account_dir = None
     args.account = None
 
-    result = await capture_stdout(invoke(args=args, command_args=command))
-    return result.rstrip()
+    return await capture_stdout(invoke(args=args, command_args=command))
+    #return result.rstrip()

From 2c38d82f4a63c91210599421be59f912132320c1 Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Tue, 18 Oct 2022 00:17:11 -0400
Subject: [PATCH 010/109] async get-nonce

---
 src/nile/cli.py             |  4 ++--
 src/nile/core/account.py    |  2 +-
 src/nile/utils/get_nonce.py | 26 +++++++++++---------------
 3 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/nile/cli.py b/src/nile/cli.py
index 91c82711..49784a68 100755
--- a/src/nile/cli.py
+++ b/src/nile/cli.py
@@ -263,9 +263,9 @@ def get_accounts(network, predeployed):
 @cli.command()
 @click.argument("contract_address")
 @network_option
-def get_nonce(contract_address, network):
+async def get_nonce(contract_address, network):
     """Retrieve the nonce for a contract."""
-    return get_nonce_command(normalize_number(contract_address), network)
+    return await get_nonce_command(normalize_number(contract_address), network)
 
 
 cli = load_plugins(cli)
diff --git a/src/nile/core/account.py b/src/nile/core/account.py
index 3f414e77..9c355ff9 100644
--- a/src/nile/core/account.py
+++ b/src/nile/core/account.py
@@ -104,7 +104,7 @@ async def send(self, address_or_alias, method, calldata, max_fee, nonce=None):
         calldata = [int(x) for x in calldata]
 
         if nonce is None:
-            nonce = get_nonce(self.address, self.network)
+            nonce = int(await get_nonce(self.address, self.network))
 
         if max_fee is None:
             max_fee = 0
diff --git a/src/nile/utils/get_nonce.py b/src/nile/utils/get_nonce.py
index 41ce36ad..f6d3e49d 100644
--- a/src/nile/utils/get_nonce.py
+++ b/src/nile/utils/get_nonce.py
@@ -1,35 +1,31 @@
 """Retrieve nonce for a contract."""
 import logging
-import os
-import subprocess
 
-from nile.common import get_gateway
+from starkware.starknet.cli import starknet_cli
 
-GATEWAYS = get_gateway()
+from nile.common import Args, get_feeder_url, capture_stdout
 
 
-def get_nonce(contract_address, network):
+async def get_nonce(contract_address, network):
     """Get the current nonce for contract address in a given network."""
-    nonce = get_nonce_without_log(contract_address, network)
+    nonce = await get_nonce_without_log(contract_address, network)
 
     logging.info(f"Current Nonce: {nonce}")
 
     return nonce
 
 
-def get_nonce_without_log(contract_address, network):
+async def get_nonce_without_log(contract_address, network):
     """Get the current nonce without logging."""
     # Starknet CLI requires a hex string for get_nonce command
     if not str(contract_address).startswith("0x"):
         contract_address = hex(int(contract_address))
 
-    command = ["starknet", "get_nonce", "--contract_address", contract_address]
+    command = ["--contract_address", contract_address]
 
-    if network == "mainnet":
-        os.environ["STARKNET_NETWORK"] = "alpha-mainnet"
-    elif network == "goerli":
-        os.environ["STARKNET_NETWORK"] = "alpha-goerli"
-    else:
-        command.append(f"--feeder_gateway_url={GATEWAYS.get(network)}")
+    args = Args()
+    args.feeder_gateway_url = get_feeder_url(network)
 
-    return int(subprocess.check_output(command).strip())
+    return await capture_stdout(
+        starknet_cli.get_nonce(args=args, command_args=command)
+    )

From 485469f5c14953f8c95196cf374225994d11b459 Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Tue, 18 Oct 2022 00:21:53 -0400
Subject: [PATCH 011/109] remove comments

---
 src/nile/core/call_or_invoke.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/nile/core/call_or_invoke.py b/src/nile/core/call_or_invoke.py
index c1255651..44367b67 100644
--- a/src/nile/core/call_or_invoke.py
+++ b/src/nile/core/call_or_invoke.py
@@ -75,7 +75,6 @@ async def _call_command(command, network):
     args.feeder_gateway_url = get_feeder_url(network)
 
     return await capture_stdout(call(args=args, command_args=command))
-    #return result.rstrip()
 
 
 async def _invoke_command(command, network):
@@ -88,4 +87,3 @@ async def _invoke_command(command, network):
     args.account = None
 
     return await capture_stdout(invoke(args=args, command_args=command))
-    #return result.rstrip()

From f7c76c73645dc68c5e100d1d37b7856b29880271 Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Tue, 18 Oct 2022 00:42:34 -0400
Subject: [PATCH 012/109] fix formatting

---
 src/nile/utils/get_nonce.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/nile/utils/get_nonce.py b/src/nile/utils/get_nonce.py
index f6d3e49d..1de3a524 100644
--- a/src/nile/utils/get_nonce.py
+++ b/src/nile/utils/get_nonce.py
@@ -3,7 +3,7 @@
 
 from starkware.starknet.cli import starknet_cli
 
-from nile.common import Args, get_feeder_url, capture_stdout
+from nile.common import Args, capture_stdout, get_feeder_url
 
 
 async def get_nonce(contract_address, network):
@@ -26,6 +26,4 @@ async def get_nonce_without_log(contract_address, network):
     args = Args()
     args.feeder_gateway_url = get_feeder_url(network)
 
-    return await capture_stdout(
-        starknet_cli.get_nonce(args=args, command_args=command)
-    )
+    return await capture_stdout(starknet_cli.get_nonce(args=args, command_args=command))

From 2c205e8e6ebbcceb4a0f55b6993e959d28414782 Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Tue, 18 Oct 2022 12:49:32 -0400
Subject: [PATCH 013/109] add event loop

---
 tests/conftest.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/conftest.py b/tests/conftest.py
index b86be8d6..15c81542 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1 +1,9 @@
 """Test configuration for pytest."""
+import asyncio
+
+import pytest
+
+
+@pytest.fixture(scope="module")
+def event_loop():
+    return asyncio.new_event_loop()

From cf3896e1bac890b15b501747d1fd9fbc6289d5c8 Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Tue, 18 Oct 2022 20:07:27 -0400
Subject: [PATCH 014/109] update tests without subprocess

---
 tests/commands/test_account.py   | 101 ++++++++++++++++---------------
 tests/commands/test_declare.py   |  70 +++++++++++----------
 tests/commands/test_deploy.py    |  60 +++++++++---------
 tests/commands/test_get_nonce.py |  65 ++++++++++----------
 4 files changed, 156 insertions(+), 140 deletions(-)

diff --git a/tests/commands/test_account.py b/tests/commands/test_account.py
index 9dd4f1c0..0f2c2d7c 100644
--- a/tests/commands/test_account.py
+++ b/tests/commands/test_account.py
@@ -1,6 +1,6 @@
 """Tests for account commands."""
 import logging
-from unittest.mock import ANY, MagicMock, patch
+from unittest.mock import ANY, Mock, MagicMock, patch
 
 import pytest
 
@@ -18,20 +18,30 @@ def tmp_working_dir(monkeypatch, tmp_path):
     return tmp_path
 
 
-@patch("nile.core.account.Account.deploy")
-def test_account_init(mock_deploy):
-    mock_deploy.return_value = MOCK_ADDRESS, MOCK_INDEX
-    account = Account(KEY, NETWORK)
+class AsyncMock(Mock):
+    """Return asynchronous mock."""
 
-    assert account.address == MOCK_ADDRESS
-    assert account.index == MOCK_INDEX
-    mock_deploy.assert_called_once()
+    async def __call__(self, *args, **kwargs):
+        """Return mocked coroutine."""
+        return super(AsyncMock, self).__call__(*args, **kwargs)
 
 
-def test_account_init_bad_key(caplog):
+@pytest.mark.asyncio
+async def test_account_init():
+    with patch("nile.core.account.Account.deploy", new=AsyncMock()) as mock_deploy:
+        mock_deploy.return_value = MOCK_ADDRESS, MOCK_INDEX
+        account = await Account(KEY, NETWORK)
+
+        assert account.address == MOCK_ADDRESS
+        assert account.index == MOCK_INDEX
+        mock_deploy.assert_called_once()
+
+
+@pytest.mark.asyncio
+async def test_account_init_bad_key(caplog):
     logging.getLogger().setLevel(logging.INFO)
 
-    Account("BAD_KEY", NETWORK)
+    await Account("BAD_KEY", NETWORK)
     assert (
         "\n❌ Cannot find BAD_KEY in env."
         "\nCheck spelling and that it exists."
@@ -39,50 +49,45 @@ def test_account_init_bad_key(caplog):
     ) in caplog.text
 
 
-@patch("nile.core.account.deploy", return_value=(1, 2))
-def test_deploy(mock_deploy):
-    account = Account(KEY, NETWORK)
-    with patch("nile.core.account.os.path.dirname") as mock_path:
-        test_path = "/overriding_path"
-        mock_path.return_value.replace.return_value = test_path
-
-        mock_deploy.assert_called_with(
-            "Account",
-            [account.signer.public_key],
-            NETWORK,
-            f"account-{account.index}",
-            ANY,
-        )
-
-
-@patch("nile.core.account.deploy", return_value=(MOCK_ADDRESS, MOCK_INDEX))
-@patch("nile.core.account.accounts.register")
-def test_deploy_accounts_register(mock_register, mock_deploy):
-    account = Account(KEY, NETWORK)
+@pytest.mark.asyncio
+async def test_deploy():
+    with patch("nile.core.account.deploy", new=AsyncMock()) as mock_deploy:
+        mock_deploy.return_value = (1, 2)
+        with patch("nile.core.account.os.path.dirname") as mock_path:
+            test_path = "/overriding_path"
+            mock_path.return_value.replace.return_value = test_path
 
-    mock_register.assert_called_once_with(
-        account.signer.public_key, MOCK_ADDRESS, MOCK_INDEX, KEY, NETWORK
-    )
+            account = await Account(KEY, NETWORK)
 
+            expected = [
+                "Account",                          # contract
+                [account.signer.public_key],        # arguments
+                NETWORK,                            # network
+                f"account-{account.index}",         # alias
+                (
+                    f"{test_path}/artifacts",       # overriding-
+                    f"{test_path}/artifacts/abis",  # path
+                ),
+            ]
 
-@patch("nile.core.account.get_nonce", return_value=0)
-@patch("nile.core.account.call_or_invoke")
-def test_send_nonce_call(mock_call, mock_nonce):
-    account = Account(KEY, NETWORK)
+            mock_deploy.assert_called_with(*expected)
 
-    # Instead of creating and populating a tmp .txt file, this uses the
-    # deployed account address (contract_address) as the target
-    account.send(account.address, "method", [1, 2, 3], max_fee=1)
 
-    # 'call_or_invoke' is called once for '__execute__'
-    assert mock_call.call_count == 1
+@pytest.mark.asyncio
+async def test_deploy_accounts_register():
+    with patch("nile.core.account.deploy", new=AsyncMock()) as mock_deploy:
+        with patch("nile.core.account.accounts.register") as mock_register:
+            mock_deploy.return_value = (MOCK_ADDRESS, MOCK_INDEX)
+            account = await Account(KEY, NETWORK)
 
-    # Check 'get_nonce' call
-    mock_nonce.assert_called_once_with(account.address, NETWORK)
+            mock_register.assert_called_once_with(
+                account.signer.public_key, MOCK_ADDRESS, MOCK_INDEX, KEY, NETWORK
+            )
 
 
-def test_send_sign_transaction_and_execute():
-    account = Account(KEY, NETWORK)
+@pytest.mark.asyncio
+async def test_send_sign_transaction_and_execute():
+    account = await Account(KEY, NETWORK)
 
     calldata = ["111", "222", "333"]
     sig_r, sig_s = [999, 888]
@@ -90,11 +95,11 @@ def test_send_sign_transaction_and_execute():
 
     account.signer.sign_transaction = MagicMock(return_value=return_signature)
 
-    with patch("nile.core.account.call_or_invoke") as mock_call:
+    with patch("nile.core.account.call_or_invoke", new=AsyncMock()) as mock_call:
         send_args = [account.address, "method", [1, 2, 3]]
         nonce = 4
         max_fee = 1
-        account.send(*send_args, max_fee, nonce)
+        await account.send(*send_args, max_fee, nonce)
 
         # Check values are correctly passed to 'sign_transaction'
         account.signer.sign_transaction.assert_called_once_with(
diff --git a/tests/commands/test_declare.py b/tests/commands/test_declare.py
index 0c8e56d6..7ff2f8f6 100644
--- a/tests/commands/test_declare.py
+++ b/tests/commands/test_declare.py
@@ -1,6 +1,6 @@
 """Tests for declare command."""
 import logging
-from unittest.mock import patch
+from unittest.mock import Mock, patch
 
 import pytest
 
@@ -14,13 +14,21 @@ def tmp_working_dir(monkeypatch, tmp_path):
     return tmp_path
 
 
+class AsyncMock(Mock):
+    """Return asynchronous mock."""
+
+    async def __call__(self, *args, **kwargs):
+        """Return mocked coroutine."""
+        return super(AsyncMock, self).__call__(*args, **kwargs)
+
+
 CONTRACT = "contract"
 NETWORK = "goerli"
 ALIAS = "alias"
 PATH = "path"
-RUN_OUTPUT = b"output"
 HASH = 111
 TX_HASH = 222
+RUN_OUTPUT = [HASH, TX_HASH]
 
 
 def test_alias_exists():
@@ -33,56 +41,54 @@ def test_alias_exists():
         assert alias_exists(ALIAS, NETWORK) is True
 
 
+@pytest.mark.asyncio
 @pytest.mark.parametrize(
-    "args, exp_command, exp_register",
+    "args, exp_register",
     [
         (
             [CONTRACT, NETWORK],  # args
-            [CONTRACT, NETWORK, None],  # expected command
             [HASH, NETWORK, None],  # expected register
         ),
         (
             [CONTRACT, NETWORK, ALIAS],  # args
-            [CONTRACT, NETWORK, None],  # expected command
             [HASH, NETWORK, ALIAS],  # expected register
         ),
         (
             [CONTRACT, NETWORK, ALIAS, PATH],  # args
-            [CONTRACT, NETWORK, PATH],  # expected command
             [HASH, NETWORK, ALIAS],  # expected register
         ),
     ],
 )
-@patch("nile.core.declare.run_command", return_value=RUN_OUTPUT)
-@patch("nile.core.declare.parse_information", return_value=[HASH, TX_HASH])
-@patch("nile.core.declare.deployments.register_class_hash")
-def test_declare(
-    mock_register, mock_parse, mock_run_cmd, caplog, args, exp_command, exp_register
-):
+async def test_declare(caplog, args, exp_register):
     logging.getLogger().setLevel(logging.INFO)
-
-    # check return value
-    res = declare(*args)
-    assert res == HASH
-
-    # check internals
-    mock_run_cmd.assert_called_once_with(*exp_command, operation="declare")
-    mock_parse.assert_called_once_with(RUN_OUTPUT)
-    mock_register.assert_called_once_with(*exp_register)
-
-    # check logs
-    assert f"🚀 Declaring {CONTRACT}" in caplog.text
-    assert (
-        f"⏳ Declaration of {CONTRACT} successfully sent at {hex(HASH)}" in caplog.text
-    )
-    assert f"🧾 Transaction hash: {hex(TX_HASH)}" in caplog.text
-
-
+    with patch("nile.core.declare.capture_stdout", new=AsyncMock()) as mock_capture:
+        mock_capture.return_value = [HASH, TX_HASH]
+        with patch("nile.core.declare.parse_information") as mock_parse:
+            mock_parse.return_value = [HASH, TX_HASH]
+            with patch("nile.core.declare.run_command", new=AsyncMock()):
+                with patch("nile.core.declare.deployments.register_class_hash") as mock_register:
+                    # check return value
+                    res = await declare(*args)
+                    assert res == HASH
+
+                    # check internals
+                    mock_parse.assert_called_once_with(RUN_OUTPUT)
+                    mock_register.assert_called_once_with(*exp_register)
+
+                    # check logs
+                    assert f"🚀 Declaring {CONTRACT}" in caplog.text
+                    assert (
+                        f"⏳ Declaration of {CONTRACT} successfully sent at {hex(HASH)}" in caplog.text
+                    )
+                    assert f"🧾 Transaction hash: {hex(TX_HASH)}" in caplog.text
+
+
+@pytest.mark.asyncio
 @patch("nile.core.declare.alias_exists", return_value=True)
-def test_declare_duplicate_hash(mock_alias_check):
+async def test_declare_duplicate_hash(mock_alias_check):
 
     with pytest.raises(Exception) as err:
-        declare(ALIAS, NETWORK)
+        await declare(ALIAS, NETWORK)
 
         assert (
             f"Alias {ALIAS} already exists in {NETWORK}.{DECLARATIONS_FILENAME}"
diff --git a/tests/commands/test_deploy.py b/tests/commands/test_deploy.py
index 262edf84..0b26fc61 100644
--- a/tests/commands/test_deploy.py
+++ b/tests/commands/test_deploy.py
@@ -1,6 +1,6 @@
 """Tests for deploy command."""
 import logging
-from unittest.mock import patch
+from unittest.mock import Mock, patch
 
 import pytest
 
@@ -14,6 +14,14 @@ def tmp_working_dir(monkeypatch, tmp_path):
     return tmp_path
 
 
+class AsyncMock(Mock):
+    """Return asynchronous mock."""
+
+    async def __call__(self, *args, **kwargs):
+        """Return mocked coroutine."""
+        return super(AsyncMock, self).__call__(*args, **kwargs)
+
+
 CONTRACT = "contract"
 NETWORK = "goerli"
 ALIAS = "alias"
@@ -21,58 +29,54 @@ def tmp_working_dir(monkeypatch, tmp_path):
 ABI_OVERRIDE = f"{ABIS_DIRECTORY}/override.json"
 BASE_PATH = (BUILD_DIRECTORY, ABIS_DIRECTORY)
 PATH_OVERRIDE = ("artifacts2", ABIS_DIRECTORY)
-RUN_OUTPUT = b"output"
 ARGS = [1, 2, 3]
 ADDRESS = 999
 TX_HASH = 222
+RUN_OUTPUT = [ADDRESS, TX_HASH]
 
 
+@pytest.mark.asyncio
 @pytest.mark.parametrize(
-    "args, exp_command, exp_abi",
+    "args, exp_abi",
     [
         (
             [CONTRACT, ARGS, NETWORK, ALIAS],  # args
-            [CONTRACT, NETWORK, None],  # expected command
             ABI,  # expected ABI
         ),
         (
             [CONTRACT, ARGS, NETWORK, ALIAS, PATH_OVERRIDE],  # args
-            [CONTRACT, NETWORK, PATH_OVERRIDE],  # expected command
             ABI,  # expected ABI
         ),
         (
             [CONTRACT, ARGS, NETWORK, ALIAS, None, ABI_OVERRIDE],  # args
-            [CONTRACT, NETWORK, None],  # expected command
             ABI_OVERRIDE,  # expected ABI
         ),
         (
             [CONTRACT, ARGS, NETWORK, ALIAS, PATH_OVERRIDE, ABI_OVERRIDE],  # args
-            [CONTRACT, NETWORK, PATH_OVERRIDE],  # expected command
             ABI_OVERRIDE,  # expected ABI
         ),
     ],
 )
-@patch("nile.core.deploy.run_command", return_value=RUN_OUTPUT)
-@patch("nile.core.deploy.parse_information", return_value=[ADDRESS, TX_HASH])
-@patch("nile.core.deploy.deployments.register")
-def test_deploy(
-    mock_register, mock_parse, mock_run_cmd, caplog, args, exp_command, exp_abi
-):
+async def test_deploy(caplog, args, exp_abi):
     logging.getLogger().setLevel(logging.INFO)
+    with patch("nile.core.deploy.capture_stdout", new=AsyncMock()) as mock_capture:
+        mock_capture.return_value = RUN_OUTPUT
+        with patch("nile.core.deploy.run_command", new=AsyncMock()):
+            with patch("nile.core.deploy.parse_information") as mock_parse:
+                mock_parse.return_value = RUN_OUTPUT
+                with patch("nile.core.deploy.deployments.register") as mock_register:
+                    # check return values
+                    res = await deploy(*args)
+                    assert res == (ADDRESS, exp_abi)
 
-    # check return values
-    res = deploy(*args)
-    assert res == (ADDRESS, exp_abi)
-
-    # check internals
-    mock_run_cmd.assert_called_once_with(*exp_command, arguments=ARGS)
-    mock_parse.assert_called_once_with(RUN_OUTPUT)
-    mock_register.assert_called_once_with(ADDRESS, exp_abi, NETWORK, ALIAS)
+                    # check internals
+                    mock_parse.assert_called_once_with(RUN_OUTPUT)
+                    mock_register.assert_called_once_with(ADDRESS, exp_abi, NETWORK, ALIAS)
 
-    # check logs
-    assert f"🚀 Deploying {CONTRACT}" in caplog.text
-    assert (
-        f"⏳ ️Deployment of {CONTRACT} successfully sent at {hex_address(ADDRESS)}"
-        in caplog.text
-    )
-    assert f"🧾 Transaction hash: {hex(TX_HASH)}" in caplog.text
+                    # check logs
+                    assert f"🚀 Deploying {CONTRACT}" in caplog.text
+                    assert (
+                        f"⏳ ️Deployment of {CONTRACT} successfully sent at {hex_address(ADDRESS)}"
+                        in caplog.text
+                    )
+                    assert f"🧾 Transaction hash: {hex(TX_HASH)}" in caplog.text
diff --git a/tests/commands/test_get_nonce.py b/tests/commands/test_get_nonce.py
index 3020f7cc..97c65f89 100644
--- a/tests/commands/test_get_nonce.py
+++ b/tests/commands/test_get_nonce.py
@@ -1,55 +1,56 @@
 """Tests for get-nonce command."""
 import logging
-import os
-from unittest.mock import patch
+from unittest.mock import Mock, patch
 
 import pytest
 
-from nile.utils.get_nonce import get_nonce
+from nile.utils.get_nonce import get_nonce, get_nonce_without_log
+from nile.common import Args, get_feeder_url
 
-GATEWAYS = {"localhost": "http://127.0.0.1:5050/"}
 
+NONCE = 5
 
+class AsyncMock(Mock):
+    """Return asynchronous mock."""
+
+    async def __call__(self, *args, **kwargs):
+        """Return mocked coroutine."""
+        return super(AsyncMock, self).__call__(*args, **kwargs)
+
+
+@pytest.mark.asyncio
 @pytest.mark.parametrize(
     "contract_address, network",
     [("0xffff", "localhost"), ("0xffff", "goerli"), ("0xffff", "mainnet")],
 )
-@patch("nile.core.node.subprocess.check_output")
-@patch("nile.common.get_gateway", return_value=GATEWAYS)
-def test_call_format(mock_gateway, mock_subprocess, contract_address, network):
-    get_nonce(contract_address, network)
-
-    command = ["starknet", "get_nonce", "--contract_address", contract_address]
-    if network == "localhost":
-        command.append("--feeder_gateway_url=http://127.0.0.1:5050/")
-    else:
-        assert os.getenv("STARKNET_NETWORK") == f"alpha-{network}"
-
-    mock_subprocess.assert_called_once_with(command)
-
-
-@patch("nile.core.node.subprocess.check_output", return_value="5")
-@patch("nile.common.get_gateway", return_value=GATEWAYS)
-def test_get_nonce(mock_gateway, mock_subprocess, caplog):
+async def test_get_nonce(contract_address, network, caplog):
     logging.getLogger().setLevel(logging.INFO)
+    with patch("nile.utils.get_nonce.get_nonce_without_log", new=AsyncMock()) as mock_without_log:
+        mock_without_log.return_value = NONCE
 
-    # check return values
-    nonce = get_nonce("0xffff", "localhost")
-    assert nonce == 5
+        # Check return value
+        nonce = await get_nonce(contract_address, network)
+        assert nonce == NONCE
 
-    # check logs
-    assert "Current Nonce: 5" in caplog.text
+        # Check internal
+        mock_without_log.assert_called_once_with(contract_address, network)
 
+        # Check log
+        assert f"Current Nonce: {NONCE}" in caplog.text
 
+
+@pytest.mark.asyncio
 @pytest.mark.parametrize(
     "contract_address",
     ["0x4d2", "1234", 1234],
 )
-@patch("nile.core.node.subprocess.check_output")
-@patch("nile.common.get_gateway", return_value=GATEWAYS)
-def test_contract_address_formats(mock_gateway, mock_subprocess, contract_address):
-    get_nonce(contract_address, "goerli")
+async def test_get_nonce_without_log_address_formats(contract_address):
+    with patch("nile.utils.get_nonce.starknet_cli.get_nonce", new=AsyncMock()) as mock_starknet_cli:
+        await get_nonce_without_log(contract_address, "goerli")
+
+        args = Args()
+        args.feeder_gateway_url = get_feeder_url("goerli")
 
-    command = ["starknet", "get_nonce", "--contract_address", "0x4d2"]
+        command = ["--contract_address", "0x4d2"]
 
-    mock_subprocess.assert_called_once_with(command)
+        mock_starknet_cli.assert_called_once_with(args=args, command_args=command)

From 26cf6005e1632e13f42017bbc8cf0b97fafae9ca Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Tue, 18 Oct 2022 20:07:46 -0400
Subject: [PATCH 015/109] update cli tests with asyncclick

---
 tests/test_cli.py | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/tests/test_cli.py b/tests/test_cli.py
index e7b8a3f0..0670acc5 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -9,12 +9,12 @@
 from signal import SIGINT
 from threading import Timer
 from time import sleep
-from unittest.mock import patch
+from unittest.mock import Mock, patch
 from urllib.error import URLError
 from urllib.request import urlopen
 
 import pytest
-from click.testing import CliRunner
+from asyncclick.testing import CliRunner
 
 from nile.cli import cli
 from nile.common import (
@@ -43,11 +43,11 @@ def create_process(target, args):
     return p
 
 
-def start_node(seconds, node_args):
+async def start_node(seconds, node_args):
     """Start node with host and port specified in node_args and life in seconds."""
     # Timed kill command with SIGINT to close Node process
     Timer(seconds, lambda: kill(getpid(), SIGINT)).start()
-    CliRunner().invoke(cli, ["node", *node_args])
+    await CliRunner().invoke(cli, ["node", *node_args])
 
 
 def check_node(p, seconds, gateway_url):
@@ -63,13 +63,15 @@ def check_node(p, seconds, gateway_url):
             continue
 
 
-def test_clean():
+@pytest.mark.asyncio
+async def test_clean():
     # The implementation is already thoroughly covered by unit tests, so here
     # we just check whether the command completes successfully.
-    result = CliRunner().invoke(cli, ["clean"])
+    result = await CliRunner().invoke(cli, ["clean"])
     assert result.exit_code == 0
 
 
+@pytest.mark.asyncio
 @pytest.mark.parametrize(
     "args, expected",
     [
@@ -83,7 +85,7 @@ def test_clean():
     reason="Issue in cairo-lang. "
     "See https://github.com/starkware-libs/cairo-lang/issues/27",
 )
-def test_compile(args, expected):
+async def test_compile(args, expected):
     contract_source = RESOURCES_DIR / "contracts" / "contract.cairo"
 
     target_dir = Path(CONTRACTS_DIRECTORY)
@@ -98,20 +100,21 @@ def test_compile(args, expected):
     assert not abi_dir.exists()
     assert not build_dir.exists()
 
-    result = CliRunner().invoke(cli, ["compile", *args])
+    result = await CliRunner().invoke(cli, ["compile", *args])
     assert result.exit_code == 0
 
     assert {f.name for f in abi_dir.glob("*.json")} == expected
     assert {f.name for f in build_dir.glob("*.json")} == expected
 
 
+@pytest.mark.asyncio
 @pytest.mark.xfail(
     sys.version_info >= (3, 10),
     reason="Issue in cairo-lang. "
     "See https://github.com/starkware-libs/cairo-lang/issues/27",
 )
 @patch("nile.core.node.subprocess")
-def test_node_forwards_args(mock_subprocess):
+async def test_node_forwards_args(mock_subprocess):
     args = [
         "--host",
         "localhost",
@@ -121,13 +124,14 @@ def test_node_forwards_args(mock_subprocess):
         "1234",
     ]
 
-    result = CliRunner().invoke(cli, ["node", *args])
+    result = await CliRunner().invoke(cli, ["node", *args])
     assert result.exit_code == 0
 
     expected = ["starknet-devnet", *args]
     mock_subprocess.check_call.assert_called_once_with(expected)
 
 
+@pytest.mark.asyncio
 @pytest.mark.parametrize(
     "opts, expected",
     [
@@ -141,7 +145,7 @@ def test_node_forwards_args(mock_subprocess):
     reason="Issue in cairo-lang. "
     "See https://github.com/starkware-libs/cairo-lang/issues/27",
 )
-def test_node_runs_gateway(opts, expected):
+async def test_node_runs_gateway(opts, expected):
     # Node life
     seconds = 15
 
@@ -162,7 +166,8 @@ def test_node_runs_gateway(opts, expected):
 
     # Spawn process to start StarkNet local network with specified port
     # i.e. $ nile node --host localhost --port 5001
-    p = create_process(target=start_node, args=(seconds, args))
+    init_node = await start_node(seconds, args)
+    p = create_process(target=init_node, args=(seconds, args))
     p.start()
 
     # Check node heartbeat and assert that it is running
@@ -177,6 +182,7 @@ def test_node_runs_gateway(opts, expected):
     assert gateway.get(network) == expected
 
 
+@pytest.mark.asyncio
 @pytest.mark.parametrize(
     "args",
     [
@@ -185,11 +191,11 @@ def test_node_runs_gateway(opts, expected):
     ],
 )
 @patch("nile.utils.debug.subprocess")
-def test_debug(mock_subprocess, args):
+async def test_debug(mock_subprocess, args):
     # debug will hang without patch
     mock_subprocess.check_output.return_value = json.dumps({"tx_status": "ACCEPTED"})
 
-    result = CliRunner().invoke(cli, ["debug", *args])
+    result = await CliRunner().invoke(cli, ["debug", *args])
 
     # Check status
     assert result.exit_code == 0

From 515a1fa9877776b1338a9d4c9d3beff613588639 Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Wed, 19 Oct 2022 16:05:28 -0400
Subject: [PATCH 016/109] adjust tests to async

---
 tests/commands/test_account.py   | 12 ++++++------
 tests/commands/test_declare.py   |  7 +++++--
 tests/commands/test_deploy.py    | 17 ++++++++++-------
 tests/commands/test_get_nonce.py | 12 ++++++++----
 tests/test_cli.py                |  2 +-
 5 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/tests/commands/test_account.py b/tests/commands/test_account.py
index 0f2c2d7c..e3ea4410 100644
--- a/tests/commands/test_account.py
+++ b/tests/commands/test_account.py
@@ -1,6 +1,6 @@
 """Tests for account commands."""
 import logging
-from unittest.mock import ANY, Mock, MagicMock, patch
+from unittest.mock import MagicMock, Mock, patch
 
 import pytest
 
@@ -60,12 +60,12 @@ async def test_deploy():
             account = await Account(KEY, NETWORK)
 
             expected = [
-                "Account",                          # contract
-                [account.signer.public_key],        # arguments
-                NETWORK,                            # network
-                f"account-{account.index}",         # alias
+                "Account",  # contract
+                [account.signer.public_key],  # arguments
+                NETWORK,  # network
+                f"account-{account.index}",  # alias
                 (
-                    f"{test_path}/artifacts",       # overriding-
+                    f"{test_path}/artifacts",  # overriding-
                     f"{test_path}/artifacts/abis",  # path
                 ),
             ]
diff --git a/tests/commands/test_declare.py b/tests/commands/test_declare.py
index 7ff2f8f6..3725c0a2 100644
--- a/tests/commands/test_declare.py
+++ b/tests/commands/test_declare.py
@@ -66,7 +66,9 @@ async def test_declare(caplog, args, exp_register):
         with patch("nile.core.declare.parse_information") as mock_parse:
             mock_parse.return_value = [HASH, TX_HASH]
             with patch("nile.core.declare.run_command", new=AsyncMock()):
-                with patch("nile.core.declare.deployments.register_class_hash") as mock_register:
+                with patch(
+                    "nile.core.declare.deployments.register_class_hash"
+                ) as mock_register:
                     # check return value
                     res = await declare(*args)
                     assert res == HASH
@@ -78,7 +80,8 @@ async def test_declare(caplog, args, exp_register):
                     # check logs
                     assert f"🚀 Declaring {CONTRACT}" in caplog.text
                     assert (
-                        f"⏳ Declaration of {CONTRACT} successfully sent at {hex(HASH)}" in caplog.text
+                        f"⏳ Declaration of {CONTRACT} successfully sent at {hex(HASH)}"
+                        in caplog.text
                     )
                     assert f"🧾 Transaction hash: {hex(TX_HASH)}" in caplog.text
 
diff --git a/tests/commands/test_deploy.py b/tests/commands/test_deploy.py
index 0b26fc61..3bca01c3 100644
--- a/tests/commands/test_deploy.py
+++ b/tests/commands/test_deploy.py
@@ -59,6 +59,10 @@ async def __call__(self, *args, **kwargs):
 )
 async def test_deploy(caplog, args, exp_abi):
     logging.getLogger().setLevel(logging.INFO)
+    log_1 = f"🚀 Deploying {CONTRACT}"
+    log_2 = f"⏳ ️Deployment of {CONTRACT} successfully sent at {hex_address(ADDRESS)}"
+    log_3 = f"🧾 Transaction hash: {hex(TX_HASH)}"
+
     with patch("nile.core.deploy.capture_stdout", new=AsyncMock()) as mock_capture:
         mock_capture.return_value = RUN_OUTPUT
         with patch("nile.core.deploy.run_command", new=AsyncMock()):
@@ -71,12 +75,11 @@ async def test_deploy(caplog, args, exp_abi):
 
                     # check internals
                     mock_parse.assert_called_once_with(RUN_OUTPUT)
-                    mock_register.assert_called_once_with(ADDRESS, exp_abi, NETWORK, ALIAS)
+                    mock_register.assert_called_once_with(
+                        ADDRESS, exp_abi, NETWORK, ALIAS
+                    )
 
                     # check logs
-                    assert f"🚀 Deploying {CONTRACT}" in caplog.text
-                    assert (
-                        f"⏳ ️Deployment of {CONTRACT} successfully sent at {hex_address(ADDRESS)}"
-                        in caplog.text
-                    )
-                    assert f"🧾 Transaction hash: {hex(TX_HASH)}" in caplog.text
+                    assert log_1 in caplog.text
+                    assert log_2 in caplog.text
+                    assert log_3 in caplog.text
diff --git a/tests/commands/test_get_nonce.py b/tests/commands/test_get_nonce.py
index 97c65f89..5060b276 100644
--- a/tests/commands/test_get_nonce.py
+++ b/tests/commands/test_get_nonce.py
@@ -4,12 +4,12 @@
 
 import pytest
 
-from nile.utils.get_nonce import get_nonce, get_nonce_without_log
 from nile.common import Args, get_feeder_url
-
+from nile.utils.get_nonce import get_nonce, get_nonce_without_log
 
 NONCE = 5
 
+
 class AsyncMock(Mock):
     """Return asynchronous mock."""
 
@@ -25,7 +25,9 @@ async def __call__(self, *args, **kwargs):
 )
 async def test_get_nonce(contract_address, network, caplog):
     logging.getLogger().setLevel(logging.INFO)
-    with patch("nile.utils.get_nonce.get_nonce_without_log", new=AsyncMock()) as mock_without_log:
+    with patch(
+        "nile.utils.get_nonce.get_nonce_without_log", new=AsyncMock()
+    ) as mock_without_log:
         mock_without_log.return_value = NONCE
 
         # Check return value
@@ -45,7 +47,9 @@ async def test_get_nonce(contract_address, network, caplog):
     ["0x4d2", "1234", 1234],
 )
 async def test_get_nonce_without_log_address_formats(contract_address):
-    with patch("nile.utils.get_nonce.starknet_cli.get_nonce", new=AsyncMock()) as mock_starknet_cli:
+    with patch(
+        "nile.utils.get_nonce.starknet_cli.get_nonce", new=AsyncMock()
+    ) as mock_starknet_cli:
         await get_nonce_without_log(contract_address, "goerli")
 
         args = Args()
diff --git a/tests/test_cli.py b/tests/test_cli.py
index 0670acc5..b7ba6dcf 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -9,7 +9,7 @@
 from signal import SIGINT
 from threading import Timer
 from time import sleep
-from unittest.mock import Mock, patch
+from unittest.mock import patch
 from urllib.error import URLError
 from urllib.request import urlopen
 

From 054cce6a61d26dc3c6f858d0750148fa4eaeaa14 Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Wed, 19 Oct 2022 16:07:35 -0400
Subject: [PATCH 017/109] add set_args func

---
 src/nile/common.py | 47 ++++++++++++++++------------------------------
 1 file changed, 16 insertions(+), 31 deletions(-)

diff --git a/src/nile/common.py b/src/nile/common.py
index c648a048..04644ea2 100644
--- a/src/nile/common.py
+++ b/src/nile/common.py
@@ -4,8 +4,9 @@
 import os
 import re
 import sys
+from types import SimpleNamespace
 
-from starkware.starknet.cli.starknet_cli import NETWORKS, deploy
+from starkware.starknet.cli.starknet_cli import NETWORKS
 
 from nile.utils import normalize_number, str_to_felt
 
@@ -51,27 +52,6 @@ def get_all_contracts(ext=None, directory=None):
     return files
 
 
-async def run_command(
-    contract_name, network, overriding_path=None, operation="deploy", arguments=None
-):
-    """Execute CLI command with given parameters."""
-    base_path = (
-        overriding_path if overriding_path else (BUILD_DIRECTORY, ABIS_DIRECTORY)
-    )
-    contract = f"{base_path[0]}/{contract_name}.json"
-    command = ["--contract", contract]
-
-    if arguments:
-        command.append("--inputs")
-        command.extend(prepare_params(arguments))
-
-    args = Args()
-    args.wallet = ""
-    args.gateway_url = get_gateway_url(network)
-
-    return await deploy(args=args, command_args=command)
-
-
 def parse_information(x):
     """Extract information from deploy/declare command."""
     # address is 64, tx_hash is 64 chars long
@@ -122,15 +102,6 @@ def is_alias(param):
     return is_string(param)
 
 
-class Args(dict):
-    """Helper class to mimic argparse dict."""
-
-    def __init__(self, *args, **kwargs):
-        """Instantiate class and key/value pairs through dot notation."""
-        super().__init__(*args, **kwargs)
-        self.__dict__ = self
-
-
 def get_gateway_url(network):
     """Return gateway URL for specified network."""
     if network == "localhost":
@@ -158,3 +129,17 @@ async def capture_stdout(func):
     sys.stdout = stdout
     result = output.rstrip()
     return result
+
+
+def set_args(network):
+    """Set context args for StarkNet CLI call."""
+    args = {
+        "gateway_url": get_gateway_url(network),
+        "feeder_gateway_url": get_feeder_url(network),
+        "wallet": "",
+        "network_id": network,
+        "account_dir": None,
+        "account": None,
+    }
+    ret_obj = SimpleNamespace(**args)
+    return ret_obj

From 0b0da8796e87c7bc713590d9ba33f5a801a2eae3 Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Wed, 19 Oct 2022 16:09:15 -0400
Subject: [PATCH 018/109] simplify context with set_args

---
 src/nile/core/call_or_invoke.py | 47 +++++++++------------------------
 src/nile/core/deploy.py         | 16 +++++++++--
 src/nile/utils/get_nonce.py     |  5 ++--
 3 files changed, 28 insertions(+), 40 deletions(-)

diff --git a/src/nile/core/call_or_invoke.py b/src/nile/core/call_or_invoke.py
index 44367b67..e1703001 100644
--- a/src/nile/core/call_or_invoke.py
+++ b/src/nile/core/call_or_invoke.py
@@ -4,13 +4,7 @@
 from starkware.starknet.cli.starknet_cli import AbiFormatError, call, invoke
 
 from nile import deployments
-from nile.common import (
-    Args,
-    capture_stdout,
-    get_feeder_url,
-    get_gateway_url,
-    prepare_params,
-)
+from nile.common import capture_stdout, prepare_params, set_args
 from nile.core import account
 from nile.utils import hex_address
 
@@ -26,7 +20,7 @@ async def call_or_invoke(
         address, abi = next(deployments.load(contract, network))
 
     address = hex_address(address)
-    command = [
+    command_args = [
         "--address",
         address,
         "--abi",
@@ -38,26 +32,28 @@ async def call_or_invoke(
     params = prepare_params(params)
 
     if len(params) > 0:
-        command.append("--inputs")
-        command.extend(params)
+        command_args.append("--inputs")
+        command_args.extend(params)
 
     if signature is not None:
-        command.append("--signature")
-        command.extend(signature)
+        command_args.append("--signature")
+        command_args.extend(signature)
 
     if max_fee is not None:
-        command.append("--max_fee")
-        command.append(max_fee)
+        command_args.append("--max_fee")
+        command_args.append(max_fee)
+
+    args = set_args(network)
 
     if type == "call":
         try:
-            return await _call_command(command, network)
+            return await capture_stdout(call(args=args, command_args=command_args))
         except AbiFormatError as err:
             logging.error(err)
 
     elif type == "invoke":
         try:
-            return await _invoke_command(command, network)
+            return await capture_stdout(invoke(args=args, command_args=command_args))
         except BaseException as err:
             if "max_fee must be bigger than 0." in str(err):
                 logging.error(
@@ -68,22 +64,3 @@ async def call_or_invoke(
                 )
             else:
                 raise err
-
-
-async def _call_command(command, network):
-    args = Args()
-    args.feeder_gateway_url = get_feeder_url(network)
-
-    return await capture_stdout(call(args=args, command_args=command))
-
-
-async def _invoke_command(command, network):
-    args = Args()
-    args.feeder_gateway_url = get_feeder_url(network)
-    args.gateway_url = get_gateway_url(network)
-    args.wallet = ""
-    args.network_id = network
-    args.account_dir = None
-    args.account = None
-
-    return await capture_stdout(invoke(args=args, command_args=command))
diff --git a/src/nile/core/deploy.py b/src/nile/core/deploy.py
index 6a9bf617..d46744fe 100644
--- a/src/nile/core/deploy.py
+++ b/src/nile/core/deploy.py
@@ -1,13 +1,16 @@
 """Command to deploy StarkNet smart contracts."""
 import logging
 
+from starkware.starknet.cli import starknet_cli
+
 from nile import deployments
 from nile.common import (
     ABIS_DIRECTORY,
     BUILD_DIRECTORY,
     capture_stdout,
     parse_information,
-    run_command,
+    prepare_params,
+    set_args,
 )
 from nile.utils import hex_address
 
@@ -23,8 +26,17 @@ async def deploy(
     )
     register_abi = abi if abi is not None else f"{base_path[1]}/{contract_name}.json"
 
+    contract = f"{base_path[0]}/{contract_name}.json"
+    command_args = ["--contract", contract]
+
+    if arguments:
+        command_args.append("--inputs")
+        command_args.extend(prepare_params(arguments))
+
+    args = set_args(network)
+
     output = await capture_stdout(
-        run_command(contract_name, network, overriding_path, arguments=arguments)
+        starknet_cli.deploy(args=args, command_args=command_args)
     )
 
     address, tx_hash = parse_information(output)
diff --git a/src/nile/utils/get_nonce.py b/src/nile/utils/get_nonce.py
index 1de3a524..1c2f9861 100644
--- a/src/nile/utils/get_nonce.py
+++ b/src/nile/utils/get_nonce.py
@@ -3,7 +3,7 @@
 
 from starkware.starknet.cli import starknet_cli
 
-from nile.common import Args, capture_stdout, get_feeder_url
+from nile.common import capture_stdout, set_args
 
 
 async def get_nonce(contract_address, network):
@@ -23,7 +23,6 @@ async def get_nonce_without_log(contract_address, network):
 
     command = ["--contract_address", contract_address]
 
-    args = Args()
-    args.feeder_gateway_url = get_feeder_url(network)
+    args = set_args(network)
 
     return await capture_stdout(starknet_cli.get_nonce(args=args, command_args=command))

From 602b14b643ba9ef02ee03556bcc199583ab06969 Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Wed, 19 Oct 2022 18:54:37 -0400
Subject: [PATCH 019/109] remove subprocess, add set_args

---
 src/nile/core/declare.py | 40 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 37 insertions(+), 3 deletions(-)

diff --git a/src/nile/core/declare.py b/src/nile/core/declare.py
index 6e2b5151..52302c2a 100644
--- a/src/nile/core/declare.py
+++ b/src/nile/core/declare.py
@@ -1,16 +1,29 @@
 """Command to declare StarkNet smart contracts."""
 import logging
 
+from starkware.starknet.cli import starknet_cli
+
 from nile import deployments
 from nile.common import (
+    ABIS_DIRECTORY,
+    BUILD_DIRECTORY,
     DECLARATIONS_FILENAME,
     capture_stdout,
     parse_information,
-    run_command,
+    prepare_params,
+    set_args,
 )
 
 
-async def declare(contract_name, network, alias=None, overriding_path=None):
+async def declare(
+    sender,
+    contract_name,
+    signature,
+    network,
+    alias=None,
+    overriding_path=None,
+    max_fee=None,
+):
     """Declare StarkNet smart contracts."""
     logging.info(f"🚀 Declaring {contract_name}")
 
@@ -18,9 +31,30 @@ async def declare(contract_name, network, alias=None, overriding_path=None):
         file = f"{network}.{DECLARATIONS_FILENAME}"
         raise Exception(f"Alias {alias} already exists in {file}")
 
+    base_path = (
+        overriding_path if overriding_path else (BUILD_DIRECTORY, ABIS_DIRECTORY)
+    )
+    contract = f"{base_path[0]}/{contract_name}.json"
+
+    command_args = [
+        "--contract",
+        contract,
+        "--sender",
+        hex(sender),
+        "--max_fee",
+        max_fee,
+    ]
+
+    if signature is not None:
+        command_args.append("--signature")
+        command_args.extend(prepare_params(signature))
+
+    args = set_args(network)
+
     output = await capture_stdout(
-        run_command(contract_name, network, overriding_path, operation="declare")
+        starknet_cli.declare(args=args, command_args=command_args)
     )
+
     class_hash, tx_hash = parse_information(output)
     logging.info(
         f"⏳ Declaration of {contract_name} successfully sent at {hex(class_hash)}"

From 195a24bb07df3180de02c5f8d8ee5c49bc3b2f88 Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Wed, 19 Oct 2022 23:44:01 -0400
Subject: [PATCH 020/109] add tests for common funcs

---
 tests/test_common.py | 82 ++++++++++++++++++++++++++++++--------------
 1 file changed, 56 insertions(+), 26 deletions(-)

diff --git a/tests/test_common.py b/tests/test_common.py
index cb4af45d..89099081 100644
--- a/tests/test_common.py
+++ b/tests/test_common.py
@@ -1,38 +1,22 @@
 """Tests for common library."""
-from unittest.mock import patch
-
 import pytest
 
-from nile.common import BUILD_DIRECTORY, prepare_params, run_command, stringify
+from nile.common import (
+    capture_stdout,
+    get_feeder_url,
+    get_gateway_url,
+    parse_information,
+    prepare_params,
+    stringify,
+)
 
-CONTRACT = "contract"
-OPERATION = "invoke"
 NETWORK = "goerli"
 ARGS = ["1", "2", "3"]
 LIST1 = [1, 2, 3]
 LIST2 = [1, 2, 3, [4, 5, 6]]
 LIST3 = [1, 2, 3, [4, 5, 6, [7, 8, 9]]]
-
-
-@pytest.mark.parametrize("operation", ["invoke", "call"])
-@patch("nile.common.subprocess.check_output")
-def test_run_command(mock_subprocess, operation):
-
-    run_command(
-        contract_name=CONTRACT, network=NETWORK, operation=operation, arguments=ARGS
-    )
-
-    mock_subprocess.assert_called_once_with(
-        [
-            "starknet",
-            operation,
-            "--contract",
-            f"{BUILD_DIRECTORY}/{CONTRACT}.json",
-            "--inputs",
-            *ARGS,
-            "--no_wallet",
-        ]
-    )
+STDOUT_1 = "SDTOUT_1"
+STDOUT_2 = "SDTOUT_2"
 
 
 @pytest.mark.parametrize(
@@ -62,3 +46,49 @@ def test_stringify(args, expected):
 )
 def test_prepare_params(args, expected):
     assert prepare_params(args) == expected
+
+
+@pytest.mark.parametrize(
+    "network, expected",
+    [
+        ("localhost", "http://127.0.0.1:5050/"),
+        ("goerli", "https://alpha4.starknet.io/gateway"),
+        ("mainnet", "https://alpha-mainnet.starknet.io/gateway"),
+    ],
+)
+def test_get_gateway_url(network, expected):
+    url = get_gateway_url(network)
+    assert url == expected
+
+
+@pytest.mark.parametrize(
+    "network, expected",
+    [
+        ("localhost", "http://127.0.0.1:5050/"),
+        ("goerli", "https://alpha4.starknet.io/feeder_gateway"),
+        ("mainnet", "https://alpha-mainnet.starknet.io/feeder_gateway"),
+    ],
+)
+def test_get_feeder_url(network, expected):
+    url = get_feeder_url(network)
+    assert url == expected
+
+
+@pytest.mark.asyncio
+async def test_capture_stdout():
+    async def helper():
+        print(STDOUT_1)
+        print(STDOUT_2)
+
+    output = await capture_stdout(helper())
+
+    assert f"{STDOUT_1}\n{STDOUT_2}" in output
+
+
+def test_parse_information():
+    a = format(1, "#066x")
+    b = format(2, "#066x")
+    target = f"Formatting 'a': {a}. Formatting 'b': {b}."
+
+    _a, _b = parse_information(target)
+    assert _a, _b == (a, b)

From 9fe9d176fb774f8faa1de163d38b8a2f7f6637ed Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Thu, 20 Oct 2022 19:59:33 -0400
Subject: [PATCH 021/109] async debug, remove subprocess

---
 src/nile/cli.py              |  4 ++--
 src/nile/utils/debug.py      | 27 ++++++++++++++-------------
 tests/commands/test_debug.py | 15 ++++++++++++---
 3 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/src/nile/cli.py b/src/nile/cli.py
index 49784a68..2c784ff2 100755
--- a/src/nile/cli.py
+++ b/src/nile/cli.py
@@ -244,9 +244,9 @@ def version():
 @click.argument("tx_hash", nargs=1)
 @network_option
 @click.option("--contracts_file", nargs=1)
-def debug(tx_hash, network, contracts_file):
+async def debug(tx_hash, network, contracts_file):
     """Locate an error in a transaction using contracts."""
-    debug_command(normalize_number(tx_hash), network, contracts_file)
+    await debug_command(normalize_number(tx_hash), network, contracts_file)
 
 
 @cli.command()
diff --git a/src/nile/utils/debug.py b/src/nile/utils/debug.py
index 1ee91c1a..8b3ff36c 100644
--- a/src/nile/utils/debug.py
+++ b/src/nile/utils/debug.py
@@ -4,36 +4,37 @@
 import logging
 import os
 import re
-import subprocess
 import time
+from starkware.starknet.cli import starknet_cli
 
 from nile.common import (
     BUILD_DIRECTORY,
     DEPLOYMENTS_FILENAME,
-    GATEWAYS,
     RETRY_AFTER_SECONDS,
+    capture_stdout,
+    set_args
 )
 
 
-def debug(tx_hash, network, contracts_file=None):
+async def debug(tx_hash, network, contracts_file=None):
     """Use available contracts to help locate the error in a rejected transaction."""
     # Starknet CLI expects hex strings
-    command = ["starknet", "tx_status", "--hash", hex(tx_hash)]
+    command_args = ["--hash", hex(tx_hash)]
 
-    if network == "mainnet":
-        os.environ["STARKNET_NETWORK"] = "alpha-mainnet"
-    elif network == "goerli":
-        os.environ["STARKNET_NETWORK"] = "alpha-goerli"
-    else:
-        command.append(f"--feeder_gateway_url={GATEWAYS.get(network)}")
+    args = set_args(network)
+
+    output = await capture_stdout(
+        starknet_cli.tx_status(args=args, command_args=command_args)
+    )
 
     logging.info(
         "⏳ Querying the network to check transaction status and identify contracts..."
     )
 
     while True:
-        receipt = json.loads(subprocess.check_output(command))
+        receipt = json.loads(output)
         status = receipt["tx_status"]
+
         if status == "REJECTED":
             break
         output = f"Transaction status: {status}"
@@ -72,10 +73,10 @@ def debug(tx_hash, network, contracts_file=None):
         logging.info(error_message)
         return error_message
 
-    command += ["--contracts", ",".join(contracts), "--error_message"]
+    command_args += ["--contracts", ",".join(contracts), "--error_message"]
     logging.info(f"🧾 Found contracts: {contracts}")
     logging.info("⏳ Querying the network with identified contracts...")
-    output = subprocess.check_output(command)
+    output = await starknet_cli.tx_status(args=args, command_args=command_args)
 
     logging.info(f"🧾 Error message:\n{output.decode()}")
     return output
diff --git a/tests/commands/test_debug.py b/tests/commands/test_debug.py
index 2977971a..c1f78ce5 100644
--- a/tests/commands/test_debug.py
+++ b/tests/commands/test_debug.py
@@ -2,7 +2,7 @@
 import logging
 import sys
 from pathlib import Path
-from unittest.mock import patch
+from unittest.mock import Mock, patch
 
 import pytest
 
@@ -28,6 +28,14 @@ def tmp_working_dir(monkeypatch, tmp_path):
     return tmp_path
 
 
+class AsyncMock(Mock):
+    """Return asynchronous mock."""
+
+    async def __call__(self, *args, **kwargs):
+        """Return mocked coroutine."""
+        return super(AsyncMock, self).__call__(*args, **kwargs)
+
+
 def test__abi_to_build_path():
     Path(BUILD_DIRECTORY).mkdir()
     filename = "contract"
@@ -64,6 +72,7 @@ def test__locate_error_lines_with_abis_misformatted_line(mock_path, caplog):
         assert f"⚠ Skipping misformatted line #1 in {MOCK_FILE}" in caplog.text
 
 
+@pytest.mark.asyncio
 @pytest.mark.parametrize(
     "args, expected",
     [
@@ -78,10 +87,10 @@ def test__locate_error_lines_with_abis_misformatted_line(mock_path, caplog):
     "See https://github.com/starkware-libs/cairo-lang/issues/27",
 )
 @patch("nile.utils.debug.json.loads")
-def test_debug_feedback_with_message(mock_json, caplog, args, expected):
+async def test_debug_feedback_with_message(mock_json, caplog, args, expected):
     logging.getLogger().setLevel(logging.INFO)
     mock_json.return_value = mocked_json_message(args)
 
-    debug(MOCK_HASH, NETWORK)
+    await debug(MOCK_HASH, NETWORK)
 
     assert expected in caplog.text

From 50484e83bc357c72d309c41656cae96f5ed1c4f2 Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Fri, 21 Oct 2022 02:34:56 -0400
Subject: [PATCH 022/109] fix test

---
 tests/commands/test_get_nonce.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tests/commands/test_get_nonce.py b/tests/commands/test_get_nonce.py
index 5060b276..5ac6b3dc 100644
--- a/tests/commands/test_get_nonce.py
+++ b/tests/commands/test_get_nonce.py
@@ -4,7 +4,7 @@
 
 import pytest
 
-from nile.common import Args, get_feeder_url
+from nile.common import set_args
 from nile.utils.get_nonce import get_nonce, get_nonce_without_log
 
 NONCE = 5
@@ -52,8 +52,7 @@ async def test_get_nonce_without_log_address_formats(contract_address):
     ) as mock_starknet_cli:
         await get_nonce_without_log(contract_address, "goerli")
 
-        args = Args()
-        args.feeder_gateway_url = get_feeder_url("goerli")
+        args = set_args("goerli")
 
         command = ["--contract_address", "0x4d2"]
 

From 1ef5ff0f4c0377205b9a26cbf1f31a91b597b44e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Triay?= <martriay@gmail.com>
Date: Thu, 27 Oct 2022 21:35:24 -0300
Subject: [PATCH 023/109] bump cairo-lang

---
 setup.cfg | 4 ++--
 tox.ini   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 323a0090..b5f941ef 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -26,8 +26,8 @@ install_requires =
     click>=8.0,<9.0
     importlib-metadata>=4.0
     python-dotenv>=0.19.2
-    starknet-devnet>=0.3.1,<0.3.4
-    cairo-lang==0.10.0
+    starknet-devnet>=0.3.1
+    cairo-lang==0.10.1
     pytest>=7.1.3
     pytest-asyncio>=0.19.0
     requests>=2.28.1
diff --git a/tox.ini b/tox.ini
index 1966f075..705fc965 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,7 +15,7 @@ extras =
     testing
 deps =
     cairo-lang==0.10.0
-    starknet-devnet==0.3.1
+    starknet-devnet==0.3.4
     # See https://github.com/starkware-libs/cairo-lang/issues/52
     marshmallow-dataclass==8.5.3
 commands =

From 9064a8cb5e385701c65a18f2045c0c7953714899 Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Fri, 28 Oct 2022 15:41:59 -0400
Subject: [PATCH 024/109] fix conflicts

---
 src/nile/artifacts/Account.json      | 12992 +++++++++++--------------
 src/nile/artifacts/abis/Account.json |     2 +-
 src/nile/cli.py                      |    53 +-
 src/nile/common.py                   |    29 +-
 src/nile/core/account.py             |   107 +-
 src/nile/core/call_or_invoke.py      |    25 +-
 src/nile/core/declare.py             |     7 +-
 src/nile/core/init.py                |    19 -
 src/nile/core/install.py             |    13 -
 src/nile/nre.py                      |    11 -
 src/nile/signer.py                   |    38 +-
 src/nile/utils/__init__.py           |     2 -
 src/nile/utils/get_nonce.py          |     3 +-
 13 files changed, 6116 insertions(+), 7185 deletions(-)
 mode change 100755 => 100644 src/nile/cli.py
 delete mode 100644 src/nile/core/install.py

diff --git a/src/nile/artifacts/Account.json b/src/nile/artifacts/Account.json
index 4d9b313e..fccdecb0 100644
--- a/src/nile/artifacts/Account.json
+++ b/src/nile/artifacts/Account.json
@@ -30,7 +30,7 @@
         {
             "inputs": [
                 {
-                    "name": "public_key",
+                    "name": "publicKey",
                     "type": "felt"
                 }
             ],
@@ -173,37 +173,37 @@
     "entry_points_by_type": {
         "CONSTRUCTOR": [
             {
-                "offset": "0x18e",
+                "offset": "0x16e",
                 "selector": "0x28ffe4ff0f226a9107253e17a904099aa4f63a02a5621de0576e5aa71bc5194"
             }
         ],
         "EXTERNAL": [
             {
-                "offset": "0x1ed",
+                "offset": "0x1cd",
                 "selector": "0xbc0eb87884ab91e330445c3584a50d7ddf4b568f02fbeb456a6242cce3f5d9"
             },
             {
-                "offset": "0x2b3",
+                "offset": "0x293",
                 "selector": "0x15d40a3d6ca2ac30f4031e42be28da9b056fef9bb7357ac5e85627ee876e5ad"
             },
             {
-                "offset": "0x244",
+                "offset": "0x224",
                 "selector": "0x162da33a4585851fe8d3af3c2a9c60b557814e221e0d4f30ff0b2189d9c7775"
             },
             {
-                "offset": "0x1b1",
+                "offset": "0x191",
                 "selector": "0x1a6c6a0bdec86cc645c91997d8eea83e87148659e3e61122f72361fd5e94079"
             },
             {
-                "offset": "0x214",
+                "offset": "0x1f4",
                 "selector": "0x213dfe25e2ca309c4d615a09cfc95fdb2fc7dc73fbcad12c450fe93b1f2ff9e"
             },
             {
-                "offset": "0x27f",
+                "offset": "0x25f",
                 "selector": "0x289da278a8dc833409cabfdad1581e8e7d40e42dcaed693fa4008dcdb4963b3"
             },
             {
-                "offset": "0x1d2",
+                "offset": "0x1b2",
                 "selector": "0x29e211664c0b63c79638fbea474206ca74016b3e9a3dc4f9ac300ffd8bdf2cd"
             }
         ],
@@ -211,40 +211,22 @@
     },
     "program": {
         "attributes": [
-            {
-                "accessible_scopes": [
-                    "openzeppelin.introspection.erc165.library",
-                    "openzeppelin.introspection.erc165.library.ERC165",
-                    "openzeppelin.introspection.erc165.library.ERC165.register_interface"
-                ],
-                "end_pc": 200,
-                "flow_tracking_data": {
-                    "ap_tracking": {
-                        "group": 17,
-                        "offset": 0
-                    },
-                    "reference_ids": {}
-                },
-                "name": "error_message",
-                "start_pc": 195,
-                "value": "ERC165: invalid interface id"
-            },
             {
                 "accessible_scopes": [
                     "openzeppelin.account.library",
                     "openzeppelin.account.library.Account",
                     "openzeppelin.account.library.Account.assert_only_self"
                 ],
-                "end_pc": 257,
+                "end_pc": 192,
                 "flow_tracking_data": {
                     "ap_tracking": {
-                        "group": 22,
+                        "group": 16,
                         "offset": 12
                     },
                     "reference_ids": {}
                 },
                 "name": "error_message",
-                "start_pc": 256,
+                "start_pc": 191,
                 "value": "Account: caller is not this account"
             },
             {
@@ -253,17 +235,17 @@
                     "openzeppelin.account.library.Account",
                     "openzeppelin.account.library.Account.execute"
                 ],
-                "end_pc": 301,
+                "end_pc": 269,
                 "flow_tracking_data": {
                     "ap_tracking": {
-                        "group": 26,
-                        "offset": 8
+                        "group": 21,
+                        "offset": 9
                     },
                     "reference_ids": {}
                 },
                 "name": "error_message",
-                "start_pc": 298,
-                "value": "Account: invalid tx version"
+                "start_pc": 259,
+                "value": "Account: deprecated tx version"
             },
             {
                 "accessible_scopes": [
@@ -271,17 +253,17 @@
                     "openzeppelin.account.library.Account",
                     "openzeppelin.account.library.Account.execute"
                 ],
-                "end_pc": 306,
+                "end_pc": 274,
                 "flow_tracking_data": {
                     "ap_tracking": {
-                        "group": 26,
-                        "offset": 15
+                        "group": 21,
+                        "offset": 49
                     },
                     "reference_ids": {}
                 },
                 "name": "error_message",
-                "start_pc": 304,
-                "value": "Account: no reentrant call"
+                "start_pc": 272,
+                "value": "Account: reentrant call"
             }
         ],
         "builtins": [
@@ -295,12 +277,6 @@
             "0x40780017fff7fff",
             "0x1",
             "0x208b7fff7fff7ffe",
-            "0x400380007ffb7ffc",
-            "0x400380017ffb7ffd",
-            "0x482680017ffb8000",
-            "0x3",
-            "0x480280027ffb8000",
-            "0x208b7fff7fff7ffe",
             "0x20780017fff7ffd",
             "0x3",
             "0x208b7fff7fff7ffe",
@@ -316,64 +292,61 @@
             "0x800000000000010fffffffffffffffffffffffffffffffffffffffffffffffb",
             "0x402a7ffc7ffd7fff",
             "0x208b7fff7fff7ffe",
-            "0x48297ffd80007ffc",
-            "0x20680017fff7fff",
-            "0x4",
-            "0x402780017ffc7ffc",
-            "0x1",
-            "0x208b7fff7fff7ffe",
-            "0x480680017fff8000",
-            "0x3ffffffffffffffffffffffffffffff",
-            "0x480280017ffc8000",
-            "0x48307fff80007ffe",
-            "0x400280027ffc7fff",
-            "0x480280017ffc8000",
+            "0x480280007ffb8000",
+            "0x480280017ffb8000",
             "0x484480017fff8000",
-            "0x100000000000000000000000000000000",
-            "0x480280007ffc8000",
-            "0x40317fff7ffe7ffd",
-            "0x482680017ffc8000",
-            "0x3",
-            "0x208b7fff7fff7ffe",
-            "0x40780017fff7fff",
-            "0x1",
-            "0x20680017fff7fff",
-            "0x10",
-            "0x480a7ffc7fff8000",
-            "0x482680017ffd8000",
-            "0x11000000000000000000000000000000000000000000000101",
-            "0x1104800180018000",
-            "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffffed",
+            "0x2aaaaaaaaaaaab05555555555555556",
+            "0x48307fff7ffd8000",
+            "0x480280027ffb8000",
+            "0x480280037ffb8000",
+            "0x484480017fff8000",
+            "0x4000000000000088000000000000001",
+            "0x48307fff7ffd8000",
+            "0xa0680017fff8000",
+            "0xe",
             "0x480680017fff8000",
             "0x800000000000011000000000000000000000000000000000000000000000000",
-            "0x48127ffe7fff8000",
-            "0x48287ffd80007ffe",
-            "0x1104800180018000",
-            "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffffe7",
+            "0x48287ffc80007fff",
+            "0x40307ffc7ff87fff",
+            "0x48297ffd80007ffc",
             "0x482680017ffd8000",
-            "0x11000000000000000000000000000000000000000000000101",
-            "0x208b7fff7fff7ffe",
-            "0x40780017fff7fff",
             "0x1",
-            "0x20680017fff7fff",
+            "0x48507fff7ffe8000",
+            "0x40507ff97ff57fff",
+            "0x482680017ffb8000",
+            "0x4",
+            "0x208b7fff7fff7ffe",
+            "0xa0680017fff8000",
             "0xc",
-            "0x40780017fff7fff",
-            "0xa",
             "0x480680017fff8000",
-            "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffeff",
-            "0x480a7ffc7fff8000",
-            "0x48287ffd80007ffe",
-            "0x1104800180018000",
-            "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffffd8",
-            "0x10780017fff7fff",
-            "0x8",
+            "0x800000000000011000000000000000000000000000000000000000000000000",
+            "0x48287ffd80007fff",
+            "0x48327fff7ffc8000",
+            "0x40307ffa7ff67fff",
+            "0x48527ffe7ffc8000",
+            "0x40507ff97ff57fff",
+            "0x482680017ffb8000",
+            "0x4",
+            "0x208b7fff7fff7ffe",
+            "0x40317ffd7ff97ffd",
+            "0x48297ffc80007ffd",
+            "0x48527fff7ffc8000",
+            "0x40507ffb7ff77fff",
             "0x40780017fff7fff",
-            "0xb",
+            "0x2",
+            "0x482680017ffb8000",
+            "0x4",
+            "0x208b7fff7fff7ffe",
+            "0x48297ffd80007ffc",
+            "0x20680017fff7fff",
+            "0x4",
+            "0x402780017ffc7ffc",
+            "0x1",
+            "0x480a7ffb7fff8000",
             "0x480a7ffc7fff8000",
             "0x480a7ffd7fff8000",
             "0x1104800180018000",
-            "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffffd0",
-            "0x480a7ffd7fff8000",
+            "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffffcc",
             "0x208b7fff7fff7ffe",
             "0x480680017fff8000",
             "0x43616c6c436f6e7472616374",
@@ -429,77 +402,25 @@
             "0x482680017ff98000",
             "0x2",
             "0x208b7fff7fff7ffe",
-            "0x480a7ffb7fff8000",
-            "0x480680017fff8000",
-            "0x10f6bdc8f69644775581b157f06334cb94ae302da4f6d09656c9a31f092cff6",
-            "0x480a7ffd7fff8000",
-            "0x1104800180018000",
-            "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffff77",
-            "0x480a7ffc7fff8000",
-            "0x48127ffe7fff8000",
-            "0x1104800180018000",
-            "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffff9b",
-            "0x48127fe17fff8000",
-            "0x48127ffd7fff8000",
-            "0x48127ffd7fff8000",
-            "0x208b7fff7fff7ffe",
-            "0x480a7ffb7fff8000",
-            "0x480a7ffc7fff8000",
-            "0x480a7ffd7fff8000",
-            "0x1104800180018000",
-            "0x800000000000010fffffffffffffffffffffffffffffffffffffffffffffff0",
-            "0x480a7ffa7fff8000",
-            "0x48127ffe7fff8000",
-            "0x1104800180018000",
-            "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffffd0",
-            "0x48127ffe7fff8000",
-            "0x48127ff57fff8000",
-            "0x48127ff57fff8000",
-            "0x48127ffc7fff8000",
-            "0x208b7fff7fff7ffe",
-            "0x480a7ffa7fff8000",
+            "0xa0680017fff8000",
+            "0xc",
+            "0x40780017fff7fff",
+            "0x6",
             "0x480a7ffb7fff8000",
             "0x480a7ffc7fff8000",
-            "0x1104800180018000",
-            "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffffe2",
-            "0x480a7ff97fff8000",
-            "0x48127ffe7fff8000",
             "0x480a7ffd7fff8000",
             "0x1104800180018000",
-            "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffffc9",
-            "0x48127ff67fff8000",
-            "0x48127ff67fff8000",
-            "0x208b7fff7fff7ffe",
-            "0x482680017ffd8000",
-            "0x800000000000010fffffffffffffffffffffffffffffffffffffffffe00365a",
-            "0x20680017fff7fff",
-            "0x8",
-            "0x480a7ffa7fff8000",
-            "0x480a7ffb7fff8000",
-            "0x480a7ffc7fff8000",
+            "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffff8c",
             "0x480680017fff8000",
             "0x1",
             "0x208b7fff7fff7ffe",
-            "0x480a7ffa7fff8000",
             "0x480a7ffb7fff8000",
-            "0x480a7ffc7fff8000",
             "0x480a7ffd7fff8000",
-            "0x1104800180018000",
-            "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffffd8",
-            "0x208b7fff7fff7ffe",
-            "0x480a7ffd7fff8000",
-            "0x480680017fff8000",
-            "0xffffffff",
-            "0x1104800180018000",
-            "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffff53",
-            "0x480a7ffa7fff8000",
-            "0x480a7ffb7fff8000",
             "0x480a7ffc7fff8000",
-            "0x480a7ffd7fff8000",
-            "0x480680017fff8000",
-            "0x1",
             "0x1104800180018000",
-            "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffffd8",
+            "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffffb1",
+            "0x480680017fff8000",
+            "0x0",
             "0x208b7fff7fff7ffe",
             "0x480a7ffc7fff8000",
             "0x480a7ffd7fff8000",
@@ -513,7 +434,7 @@
             "0x480a7ffb7fff8000",
             "0x48127ffe7fff8000",
             "0x1104800180018000",
-            "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffff92",
+            "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffffc6",
             "0x48127ffe7fff8000",
             "0x48127ff57fff8000",
             "0x48127ff57fff8000",
@@ -527,7 +448,7 @@
             "0x48127ffe7fff8000",
             "0x480a7ffd7fff8000",
             "0x1104800180018000",
-            "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffff8c",
+            "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffffc0",
             "0x48127ff67fff8000",
             "0x48127ff67fff8000",
             "0x208b7fff7fff7ffe",
@@ -537,17 +458,13 @@
             "0x480a7ffd7fff8000",
             "0x1104800180018000",
             "0x800000000000010fffffffffffffffffffffffffffffffffffffffffffffff1",
-            "0x480680017fff8000",
-            "0xf10dbd44",
-            "0x1104800180018000",
-            "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffffcd",
             "0x208b7fff7fff7ffe",
             "0x480a7ffd7fff8000",
             "0x1104800180018000",
-            "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffff6c",
+            "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffffa4",
             "0x48127ffe7fff8000",
             "0x1104800180018000",
-            "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffff62",
+            "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffff9a",
             "0x40127fff7fff7ff9",
             "0x48127ffe7fff8000",
             "0x208b7fff7fff7ffe",
@@ -555,75 +472,108 @@
             "0x480a7ffc7fff8000",
             "0x480a7ffd7fff8000",
             "0x1104800180018000",
-            "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffffd1",
+            "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffffd5",
+            "0x208b7fff7fff7ffe",
+            "0x482680017ffd8000",
+            "0x800000000000010fffffffffffffffffffffffffffffffffffffffffe00365a",
+            "0x20680017fff7fff",
+            "0x8",
+            "0x480a7ffa7fff8000",
+            "0x480a7ffb7fff8000",
+            "0x480a7ffc7fff8000",
+            "0x480680017fff8000",
+            "0x1",
+            "0x208b7fff7fff7ffe",
+            "0x482680017ffd8000",
+            "0x800000000000010ffffffffffffffffffffffffffffffffffffffff59942a8c",
+            "0x20680017fff7fff",
+            "0x8",
+            "0x480a7ffa7fff8000",
+            "0x480a7ffb7fff8000",
+            "0x480a7ffc7fff8000",
+            "0x480680017fff8000",
+            "0x1",
+            "0x208b7fff7fff7ffe",
+            "0x480a7ffa7fff8000",
+            "0x480a7ffb7fff8000",
+            "0x480a7ffc7fff8000",
+            "0x480680017fff8000",
+            "0x0",
             "0x208b7fff7fff7ffe",
             "0x480a7ffa7fff8000",
             "0x1104800180018000",
-            "0x800000000000010fffffffffffffffffffffffffffffffffffffffffffffff1",
+            "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffffd7",
             "0x480a7ffb7fff8000",
             "0x480a7ffc7fff8000",
             "0x480a7ffd7fff8000",
             "0x1104800180018000",
-            "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffffd5",
+            "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffffbf",
             "0x208b7fff7fff7ffe",
             "0x480a7ff77fff8000",
             "0x480a7ff87fff8000",
-            "0x480a7ff97fff8000",
-            "0x1104800180018000",
-            "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffffc2",
             "0x480a7ffa7fff8000",
+            "0x1104800180018000",
+            "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffffac",
+            "0x480a7ff97fff8000",
             "0x480a7ffb7fff8000",
             "0x48127ffd7fff8000",
             "0x480280007ffd8000",
             "0x480280017ffd8000",
             "0x1104800180018000",
-            "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffff69",
+            "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffff87",
             "0x48127ff47fff8000",
             "0x48127ff47fff8000",
-            "0x48127ff47fff8000",
-            "0x48127ffc7fff8000",
+            "0x48127ffd7fff8000",
+            "0x48127ff37fff8000",
             "0x480680017fff8000",
             "0x1",
             "0x208b7fff7fff7ffe",
             "0x40780017fff7fff",
-            "0x2",
+            "0x3",
             "0x480a7ff57fff8000",
             "0x1104800180018000",
-            "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffff56",
+            "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffff74",
+            "0x480a7ff97fff8000",
             "0x480680017fff8000",
             "0x1",
-            "0x400080007ffe7fff",
-            "0x48127ffd7fff8000",
+            "0x480080007ffd8000",
+            "0x1104800180018000",
+            "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffff7a",
+            "0x480680017fff8000",
+            "0x1",
+            "0x40127fff7fff7ffe",
+            "0x40137ffd7fff8000",
+            "0x48127fdc7fff8000",
             "0x1104800180018000",
-            "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffff32",
+            "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffff49",
             "0x400680017fff7fff",
             "0x0",
             "0x1104800180018000",
-            "0x800000000000010fffffffffffffffffffffffffffffffffffffffffffffecf",
-            "0x40137fff7fff8000",
+            "0x800000000000010fffffffffffffffffffffffffffffffffffffffffffffeef",
+            "0x40137fff7fff8001",
             "0x48127ffb7fff8000",
             "0x480a7ffa7fff8000",
             "0x480a7ffb7fff8000",
             "0x480a7ffd7fff8000",
-            "0x480a80007fff8000",
+            "0x480a80017fff8000",
             "0x1104800180018000",
             "0x35",
             "0x1104800180018000",
-            "0x800000000000010fffffffffffffffffffffffffffffffffffffffffffffec5",
-            "0x40137fff7fff8001",
+            "0x800000000000010fffffffffffffffffffffffffffffffffffffffffffffee5",
+            "0x40137fff7fff8002",
             "0x48127ffc7fff8000",
             "0x480a7ffa7fff8000",
-            "0x480a80007fff8000",
             "0x480a80017fff8000",
+            "0x480a80027fff8000",
             "0x1104800180018000",
             "0xa",
             "0x48127ffe7fff8000",
             "0x480a7ff67fff8000",
             "0x480a7ff77fff8000",
             "0x480a7ff87fff8000",
-            "0x480a7ff97fff8000",
+            "0x480a80007fff8000",
             "0x48127ffa7fff8000",
-            "0x480a80017fff8000",
+            "0x480a80027fff8000",
             "0x208b7fff7fff7ffe",
             "0x40780017fff7fff",
             "0x3",
@@ -639,7 +589,7 @@
             "0x480280027ffc8000",
             "0x480280037ffc8000",
             "0x1104800180018000",
-            "0x800000000000010fffffffffffffffffffffffffffffffffffffffffffffefa",
+            "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffff11",
             "0x40137ffe7fff8000",
             "0x40137fff7fff8001",
             "0x40137ffd7fff8002",
@@ -647,7 +597,7 @@
             "0x480a80017fff8000",
             "0x480a80007fff8000",
             "0x1104800180018000",
-            "0x800000000000010fffffffffffffffffffffffffffffffffffffffffffffea8",
+            "0x800000000000010fffffffffffffffffffffffffffffffffffffffffffffec2",
             "0x480a80027fff8000",
             "0x482680017ffb8000",
             "0x800000000000011000000000000000000000000000000000000000000000000",
@@ -688,7 +638,7 @@
             "0x480a7ffc7fff8000",
             "0x480a7ffd7fff8000",
             "0x1104800180018000",
-            "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffff65",
+            "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffff48",
             "0x208b7fff7fff7ffe",
             "0x482680017ffd8000",
             "0x1",
@@ -714,7 +664,7 @@
             "0x480a7ffc7fff8000",
             "0x480a7ffd7fff8000",
             "0x1104800180018000",
-            "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffff5f",
+            "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffff3e",
             "0x208b7fff7fff7ffe",
             "0x40780017fff7fff",
             "0x1",
@@ -747,7 +697,7 @@
             "0x480a7ffc7fff8000",
             "0x480a7ffd7fff8000",
             "0x1104800180018000",
-            "0x800000000000010fffffffffffffffffffffffffffffffffffffffffffffeed",
+            "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffff23",
             "0x208b7fff7fff7ffe",
             "0x40780017fff7fff",
             "0x1",
@@ -783,7 +733,7 @@
             "0x480a7ffc7fff8000",
             "0x480a7ffd7fff8000",
             "0x1104800180018000",
-            "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffff20",
+            "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffff19",
             "0x208b7fff7fff7ffe",
             "0x482680017ffd8000",
             "0x1",
@@ -813,7 +763,7 @@
             "0x480a7ffc7fff8000",
             "0x480a7ffd7fff8000",
             "0x1104800180018000",
-            "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffff0b",
+            "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffff04",
             "0x208b7fff7fff7ffe",
             "0x40780017fff7fff",
             "0x1",
@@ -835,29 +785,29 @@
             "0x480280027ffb8000",
             "0x480280007ffb8000",
             "0x480280017ffb8000",
-            "0x482480017ffd8000",
-            "0x1",
             "0x480280037ffb8000",
+            "0x482480017ffc8000",
+            "0x1",
             "0x480280007ffd8000",
             "0x480280017ffd8000",
             "0x482680017ffd8000",
             "0x2",
             "0x1104800180018000",
             "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffffdc",
-            "0x48127ffd7fff8000",
+            "0x48127ffe7fff8000",
             "0x1104800180018000",
             "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffffe3",
             "0x48127ff37fff8000",
             "0x48127ff37fff8000",
             "0x48127ffb7fff8000",
-            "0x48127ff37fff8000",
+            "0x48127ff27fff8000",
             "0x480280047ffb8000",
             "0x48127ff97fff8000",
             "0x48127ff97fff8000",
             "0x208b7fff7fff7ffe",
             "0x480a7ff67fff8000",
             "0x1104800180018000",
-            "0x800000000000010fffffffffffffffffffffffffffffffffffffffffffffe4a",
+            "0x800000000000010fffffffffffffffffffffffffffffffffffffffffffffe61",
             "0x48127ffe7fff8000",
             "0x480a7ff77fff8000",
             "0x480a7ff87fff8000",
@@ -866,7 +816,7 @@
             "0x480080037ffa8000",
             "0x480080047ff98000",
             "0x1104800180018000",
-            "0x800000000000010fffffffffffffffffffffffffffffffffffffffffffffed6",
+            "0x800000000000010fffffffffffffffffffffffffffffffffffffffffffffecf",
             "0x48127ffb7fff8000",
             "0x48127ffb7fff8000",
             "0x48127ffb7fff8000",
@@ -892,9 +842,9 @@
             "0x480280027ffb8000",
             "0x480280007ffb8000",
             "0x480280017ffb8000",
-            "0x482480017ffd8000",
-            "0x2",
             "0x480280037ffb8000",
+            "0x482480017ffc8000",
+            "0x2",
             "0x480280007ffd8000",
             "0x482680017ffd8000",
             "0x1",
@@ -907,8 +857,8 @@
             "0x1",
             "0x48127ffb7fff8000",
             "0x48127ffb7fff8000",
-            "0x48127ffb7fff8000",
-            "0x48127ffb7fff8000",
+            "0x48127ffc7fff8000",
+            "0x48127ffa7fff8000",
             "0x480280047ffb8000",
             "0x480680017fff8000",
             "0x0",
@@ -916,7 +866,7 @@
             "0x208b7fff7fff7ffe",
             "0x480a7ff97fff8000",
             "0x1104800180018000",
-            "0x800000000000010fffffffffffffffffffffffffffffffffffffffffffffe0f",
+            "0x800000000000010fffffffffffffffffffffffffffffffffffffffffffffe26",
             "0x48127ffe7fff8000",
             "0x480a7ffa7fff8000",
             "0x480a7ffb7fff8000",
@@ -925,7 +875,7 @@
             "0x480080037ffa8000",
             "0x480080047ff98000",
             "0x1104800180018000",
-            "0x800000000000010fffffffffffffffffffffffffffffffffffffffffffffe9b",
+            "0x800000000000010fffffffffffffffffffffffffffffffffffffffffffffe94",
             "0x48127ffb7fff8000",
             "0x48127ffb7fff8000",
             "0x48127ffb7fff8000",
@@ -936,8 +886,8 @@
             "0x402a7ffd7ffc7fff",
             "0x480280007ffb8000",
             "0x480280017ffb8000",
-            "0x480280027ffb8000",
             "0x480280037ffb8000",
+            "0x480280027ffb8000",
             "0x480280007ffd8000",
             "0x1104800180018000",
             "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffffe8",
@@ -945,8 +895,8 @@
             "0x1",
             "0x48127ffb7fff8000",
             "0x48127ffb7fff8000",
-            "0x48127ffb7fff8000",
-            "0x48127ffb7fff8000",
+            "0x48127ffc7fff8000",
+            "0x48127ffa7fff8000",
             "0x480280047ffb8000",
             "0x480680017fff8000",
             "0x0",
@@ -962,7 +912,7 @@
             "0x480a7ffc7fff8000",
             "0x480a7ffd7fff8000",
             "0x1104800180018000",
-            "0x800000000000010fffffffffffffffffffffffffffffffffffffffffffffe89",
+            "0x800000000000010fffffffffffffffffffffffffffffffffffffffffffffe82",
             "0x208b7fff7fff7ffe",
             "0x40780017fff7fff",
             "0x3",
@@ -978,7 +928,7 @@
             "0x480a7ffc7fff8000",
             "0x480a7ffb7fff8000",
             "0x1104800180018000",
-            "0x800000000000010fffffffffffffffffffffffffffffffffffffffffffffd5d",
+            "0x800000000000010fffffffffffffffffffffffffffffffffffffffffffffd77",
             "0x480a80017fff8000",
             "0x4829800080008002",
             "0x480a80007fff8000",
@@ -1005,10 +955,10 @@
             "0x480280027ffb8000",
             "0x480280007ffb8000",
             "0x480280017ffb8000",
-            "0x482480017ffd8000",
-            "0x2",
             "0x480280037ffb8000",
             "0x480280047ffb8000",
+            "0x482480017ffb8000",
+            "0x2",
             "0x480280007ffd8000",
             "0x482680017ffd8000",
             "0x1",
@@ -1019,9 +969,9 @@
             "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffffc2",
             "0x40137ff97fff8000",
             "0x40137ffa7fff8001",
-            "0x40137ffc7fff8002",
-            "0x40137ffd7fff8003",
-            "0x48127ffb7fff8000",
+            "0x40137ffb7fff8002",
+            "0x40137ffc7fff8003",
+            "0x48127ffd7fff8000",
             "0x1104800180018000",
             "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffffc7",
             "0x480a80007fff8000",
@@ -1051,37 +1001,37 @@
                 "autogen/starknet/arg_processor/b929869545548e90b3e0972d942496bfe6c38d7ef8c117fc5015fd8f5ae5ede3.cairo": "// Check that the length is non-negative.\nassert [range_check_ptr] = ret_value.response_len;\n// Store the updated range_check_ptr as a local variable to keep it available after\n// the memcpy.\nlocal range_check_ptr = range_check_ptr + 1;\n// Keep a reference to __return_value_ptr.\nlet __return_value_ptr_copy = __return_value_ptr;\n// Store the updated __return_value_ptr as a local variable to keep it available after\n// the memcpy.\nlocal __return_value_ptr: felt* = __return_value_ptr + ret_value.response_len * 1;\nmemcpy(\n    dst=__return_value_ptr_copy,\n    src=ret_value.response,\n    len=ret_value.response_len * 1);\n",
                 "autogen/starknet/arg_processor/c2f1fff90123af1ac991a5f7ea9000b626c118903b694b399e02806d44fb5def.cairo": "assert [__return_value_ptr] = ret_value.response_len;\nlet __return_value_ptr = __return_value_ptr + 1;\n",
                 "autogen/starknet/arg_processor/c31620b02d4d706f0542c989b2aadc01b0981d1f6a5933a8fe4937ace3d70d92.cairo": "let __calldata_actual_size =  __calldata_ptr - cast([cast(fp + (-3), felt**)], felt*);\n",
+                "autogen/starknet/arg_processor/e0103dcf78458048e6a2fbe82ac74a16ee35839175ed068cc53ace2ff3c8d843.cairo": "let __calldata_arg_publicKey = [__calldata_ptr];\nlet __calldata_ptr = __calldata_ptr + 1;\n",
                 "autogen/starknet/arg_processor/f5400fee6fdbca52ac7f13a8db039513b257d76f3d002ecd8e6ef16039a7d47d.cairo": "// Check that the length is non-negative.\nassert [range_check_ptr] = __calldata_arg_call_array_len;\nlet range_check_ptr = range_check_ptr + 1;\n// Create the reference.\nlet __calldata_arg_call_array = cast(__calldata_ptr, openzeppelin.account.library.AccountCallArray*);\n// Use 'tempvar' instead of 'let' to avoid repeating this computation for the\n// following arguments.\ntempvar __calldata_ptr = __calldata_ptr + __calldata_arg_call_array_len * 4;\n",
-                "autogen/starknet/arg_processor/fcae171a11efdbb3d6f68abb567d4209a3b5b40b77b7badc1698f31527b74fb9.cairo": "let __calldata_arg_public_key = [__calldata_ptr];\nlet __calldata_ptr = __calldata_ptr + 1;\n",
                 "autogen/starknet/external/__execute__/14203d9b4e0dcdb2fae0cfadacffb50de6a91057e77d7d8f2555840ed4167b4d.cairo": "let bitwise_ptr = [cast([cast(fp + (-5), felt**)] + 4, starkware.cairo.common.cairo_builtins.BitwiseBuiltin**)];\n",
                 "autogen/starknet/external/__execute__/2b6f94bd80770e05a0280a2684c74ec7cd726551cc04b16ccd7c3801383a9fd0.cairo": "func __execute__() -> (syscall_ptr: felt*, pedersen_ptr: starkware.cairo.common.cairo_builtins.HashBuiltin*, range_check_ptr: felt, ecdsa_ptr: starkware.cairo.common.cairo_builtins.SignatureBuiltin*, bitwise_ptr: starkware.cairo.common.cairo_builtins.BitwiseBuiltin*, size: felt, retdata: felt*) {\n    alloc_locals;\n}\n",
-                "autogen/starknet/external/__execute__/5eddd16975c94f7a4fbf6eea486e12d2a7b944f1b3837ebd72a45a0896a519c8.cairo": "let ret_value = __wrapped_func{syscall_ptr=syscall_ptr, pedersen_ptr=pedersen_ptr, range_check_ptr=range_check_ptr, ecdsa_ptr=ecdsa_ptr, bitwise_ptr=bitwise_ptr}(call_array_len=__calldata_arg_call_array_len, call_array=__calldata_arg_call_array, calldata_len=__calldata_arg_calldata_len, calldata=__calldata_arg_calldata,);\nlet (range_check_ptr, retdata_size, retdata) = __execute___encode_return(ret_value, range_check_ptr);\n",
                 "autogen/starknet/external/__execute__/741ea357d6336b0bed7bf0472425acd0311d543883b803388880e60a232040c7.cairo": "let range_check_ptr = [cast([cast(fp + (-5), felt**)] + 2, felt*)];\n",
                 "autogen/starknet/external/__execute__/9684a85e93c782014ca14293edea4eb2502039a5a7b6538ecd39c56faaf12529.cairo": "let pedersen_ptr = [cast([cast(fp + (-5), felt**)] + 1, starkware.cairo.common.cairo_builtins.HashBuiltin**)];\n",
                 "autogen/starknet/external/__execute__/972efe4adb0e1cedbdf0f0747cf1e121111a6180229de74773d49a6e595c4f3d.cairo": "let ecdsa_ptr = [cast([cast(fp + (-5), felt**)] + 3, starkware.cairo.common.cairo_builtins.SignatureBuiltin**)];\n",
                 "autogen/starknet/external/__execute__/b2c52ca2d2a8fc8791a983086d8716c5eacd0c3d62934914d2286f84b98ff4cb.cairo": "let syscall_ptr = [cast([cast(fp + (-5), felt**)] + 0, felt**)];\n",
                 "autogen/starknet/external/__execute__/b363de5c884e054e373732fa94161084d4128000eba968c31dbb40d4ab78ae25.cairo": "return (syscall_ptr,pedersen_ptr,range_check_ptr,ecdsa_ptr,bitwise_ptr,retdata_size,retdata);\n",
+                "autogen/starknet/external/__execute__/fda2b8aa49b29c30228f00b8e9823863453031a1abe9ca64b44c8468cfa74e87.cairo": "let ret_value = __wrapped_func{syscall_ptr=syscall_ptr, pedersen_ptr=pedersen_ptr, ecdsa_ptr=ecdsa_ptr, bitwise_ptr=bitwise_ptr, range_check_ptr=range_check_ptr}(call_array_len=__calldata_arg_call_array_len, call_array=__calldata_arg_call_array, calldata_len=__calldata_arg_calldata_len, calldata=__calldata_arg_calldata,);\nlet (range_check_ptr, retdata_size, retdata) = __execute___encode_return(ret_value, range_check_ptr);\n",
                 "autogen/starknet/external/__validate__/2e2c5536af4c3ea88b562852f6f3740af166f645e0f066972184481010fe04da.cairo": "let bitwise_ptr = [cast([cast(fp + (-5), felt**)] + 4, felt*)];\n",
                 "autogen/starknet/external/__validate__/741ea357d6336b0bed7bf0472425acd0311d543883b803388880e60a232040c7.cairo": "let range_check_ptr = [cast([cast(fp + (-5), felt**)] + 2, felt*)];\n",
-                "autogen/starknet/external/__validate__/87b73a6c2103aa9b2a7045f08168455c63774c534d3319c05b0c50234b021a50.cairo": "let ret_value = __wrapped_func{syscall_ptr=syscall_ptr, pedersen_ptr=pedersen_ptr, range_check_ptr=range_check_ptr, ecdsa_ptr=ecdsa_ptr}(call_array_len=__calldata_arg_call_array_len, call_array=__calldata_arg_call_array, calldata_len=__calldata_arg_calldata_len, calldata=__calldata_arg_calldata,);\n%{ memory[ap] = segments.add() %}        // Allocate memory for return value.\ntempvar retdata: felt*;\nlet retdata_size = 0;\n",
+                "autogen/starknet/external/__validate__/883be30acb6a1330d51bfd10cbcbff897d747444eaacd9630821b0430bd22dc4.cairo": "let ret_value = __wrapped_func{syscall_ptr=syscall_ptr, pedersen_ptr=pedersen_ptr, ecdsa_ptr=ecdsa_ptr, range_check_ptr=range_check_ptr}(call_array_len=__calldata_arg_call_array_len, call_array=__calldata_arg_call_array, calldata_len=__calldata_arg_calldata_len, calldata=__calldata_arg_calldata,);\n%{ memory[ap] = segments.add() %}        // Allocate memory for return value.\ntempvar retdata: felt*;\nlet retdata_size = 0;\n",
                 "autogen/starknet/external/__validate__/9684a85e93c782014ca14293edea4eb2502039a5a7b6538ecd39c56faaf12529.cairo": "let pedersen_ptr = [cast([cast(fp + (-5), felt**)] + 1, starkware.cairo.common.cairo_builtins.HashBuiltin**)];\n",
                 "autogen/starknet/external/__validate__/972efe4adb0e1cedbdf0f0747cf1e121111a6180229de74773d49a6e595c4f3d.cairo": "let ecdsa_ptr = [cast([cast(fp + (-5), felt**)] + 3, starkware.cairo.common.cairo_builtins.SignatureBuiltin**)];\n",
                 "autogen/starknet/external/__validate__/b2c52ca2d2a8fc8791a983086d8716c5eacd0c3d62934914d2286f84b98ff4cb.cairo": "let syscall_ptr = [cast([cast(fp + (-5), felt**)] + 0, felt**)];\n",
                 "autogen/starknet/external/__validate__/b363de5c884e054e373732fa94161084d4128000eba968c31dbb40d4ab78ae25.cairo": "return (syscall_ptr,pedersen_ptr,range_check_ptr,ecdsa_ptr,bitwise_ptr,retdata_size,retdata);\n",
-                "autogen/starknet/external/__validate_declare__/11e948d40597e98e975bf01626a4e8f9d0c95d23c5581719df49f99529b2abf9.cairo": "let ret_value = __wrapped_func{syscall_ptr=syscall_ptr, pedersen_ptr=pedersen_ptr, range_check_ptr=range_check_ptr, ecdsa_ptr=ecdsa_ptr}(class_hash=__calldata_arg_class_hash,);\n%{ memory[ap] = segments.add() %}        // Allocate memory for return value.\ntempvar retdata: felt*;\nlet retdata_size = 0;\n",
                 "autogen/starknet/external/__validate_declare__/2e2c5536af4c3ea88b562852f6f3740af166f645e0f066972184481010fe04da.cairo": "let bitwise_ptr = [cast([cast(fp + (-5), felt**)] + 4, felt*)];\n",
                 "autogen/starknet/external/__validate_declare__/741ea357d6336b0bed7bf0472425acd0311d543883b803388880e60a232040c7.cairo": "let range_check_ptr = [cast([cast(fp + (-5), felt**)] + 2, felt*)];\n",
                 "autogen/starknet/external/__validate_declare__/9684a85e93c782014ca14293edea4eb2502039a5a7b6538ecd39c56faaf12529.cairo": "let pedersen_ptr = [cast([cast(fp + (-5), felt**)] + 1, starkware.cairo.common.cairo_builtins.HashBuiltin**)];\n",
                 "autogen/starknet/external/__validate_declare__/972efe4adb0e1cedbdf0f0747cf1e121111a6180229de74773d49a6e595c4f3d.cairo": "let ecdsa_ptr = [cast([cast(fp + (-5), felt**)] + 3, starkware.cairo.common.cairo_builtins.SignatureBuiltin**)];\n",
+                "autogen/starknet/external/__validate_declare__/aeb171d2cc305f87c40b0407565ecdd1a4c396c46cd94f15ca0069e15eab01ed.cairo": "let ret_value = __wrapped_func{syscall_ptr=syscall_ptr, pedersen_ptr=pedersen_ptr, ecdsa_ptr=ecdsa_ptr, range_check_ptr=range_check_ptr}(class_hash=__calldata_arg_class_hash,);\n%{ memory[ap] = segments.add() %}        // Allocate memory for return value.\ntempvar retdata: felt*;\nlet retdata_size = 0;\n",
                 "autogen/starknet/external/__validate_declare__/b2c52ca2d2a8fc8791a983086d8716c5eacd0c3d62934914d2286f84b98ff4cb.cairo": "let syscall_ptr = [cast([cast(fp + (-5), felt**)] + 0, felt**)];\n",
                 "autogen/starknet/external/__validate_declare__/b363de5c884e054e373732fa94161084d4128000eba968c31dbb40d4ab78ae25.cairo": "return (syscall_ptr,pedersen_ptr,range_check_ptr,ecdsa_ptr,bitwise_ptr,retdata_size,retdata);\n",
                 "autogen/starknet/external/constructor/2e2c5536af4c3ea88b562852f6f3740af166f645e0f066972184481010fe04da.cairo": "let bitwise_ptr = [cast([cast(fp + (-5), felt**)] + 4, felt*)];\n",
                 "autogen/starknet/external/constructor/741ea357d6336b0bed7bf0472425acd0311d543883b803388880e60a232040c7.cairo": "let range_check_ptr = [cast([cast(fp + (-5), felt**)] + 2, felt*)];\n",
+                "autogen/starknet/external/constructor/85878491738bbe4da46aa469fbd2786d48e333915f5f6757828b7b21676593c8.cairo": "let ret_value = __wrapped_func{syscall_ptr=syscall_ptr, pedersen_ptr=pedersen_ptr, range_check_ptr=range_check_ptr}(publicKey=__calldata_arg_publicKey,);\n%{ memory[ap] = segments.add() %}        // Allocate memory for return value.\ntempvar retdata: felt*;\nlet retdata_size = 0;\n",
                 "autogen/starknet/external/constructor/9684a85e93c782014ca14293edea4eb2502039a5a7b6538ecd39c56faaf12529.cairo": "let pedersen_ptr = [cast([cast(fp + (-5), felt**)] + 1, starkware.cairo.common.cairo_builtins.HashBuiltin**)];\n",
                 "autogen/starknet/external/constructor/b2c52ca2d2a8fc8791a983086d8716c5eacd0c3d62934914d2286f84b98ff4cb.cairo": "let syscall_ptr = [cast([cast(fp + (-5), felt**)] + 0, felt**)];\n",
                 "autogen/starknet/external/constructor/b363de5c884e054e373732fa94161084d4128000eba968c31dbb40d4ab78ae25.cairo": "return (syscall_ptr,pedersen_ptr,range_check_ptr,ecdsa_ptr,bitwise_ptr,retdata_size,retdata);\n",
                 "autogen/starknet/external/constructor/c6c4d3a7a58c6b37d5fdd51b25e5ab9f3e75174b411ab503db3ce03636ed6e2a.cairo": "let ecdsa_ptr = [cast([cast(fp + (-5), felt**)] + 3, felt*)];\n",
-                "autogen/starknet/external/constructor/f17d1b7727f3569ff43c4ebf78ae9e4a75a5fc622bff843043f7400f1ba413ea.cairo": "let ret_value = __wrapped_func{syscall_ptr=syscall_ptr, pedersen_ptr=pedersen_ptr, range_check_ptr=range_check_ptr}(public_key=__calldata_arg_public_key,);\n%{ memory[ap] = segments.add() %}        // Allocate memory for return value.\ntempvar retdata: felt*;\nlet retdata_size = 0;\n",
                 "autogen/starknet/external/getPublicKey/2e2c5536af4c3ea88b562852f6f3740af166f645e0f066972184481010fe04da.cairo": "let bitwise_ptr = [cast([cast(fp + (-5), felt**)] + 4, felt*)];\n",
                 "autogen/starknet/external/getPublicKey/43a9d1274d92c1a4aee1843a7b473645245807418483fb76dcc5c8cdf673e692.cairo": "let ret_value = __wrapped_func{syscall_ptr=syscall_ptr, pedersen_ptr=pedersen_ptr, range_check_ptr=range_check_ptr}();\nlet (range_check_ptr, retdata_size, retdata) = getPublicKey_encode_return(ret_value, range_check_ptr);\n",
                 "autogen/starknet/external/getPublicKey/741ea357d6336b0bed7bf0472425acd0311d543883b803388880e60a232040c7.cairo": "let range_check_ptr = [cast([cast(fp + (-5), felt**)] + 2, felt*)];\n",
@@ -1093,9 +1043,9 @@
                 "autogen/starknet/external/isValidSignature/741ea357d6336b0bed7bf0472425acd0311d543883b803388880e60a232040c7.cairo": "let range_check_ptr = [cast([cast(fp + (-5), felt**)] + 2, felt*)];\n",
                 "autogen/starknet/external/isValidSignature/9684a85e93c782014ca14293edea4eb2502039a5a7b6538ecd39c56faaf12529.cairo": "let pedersen_ptr = [cast([cast(fp + (-5), felt**)] + 1, starkware.cairo.common.cairo_builtins.HashBuiltin**)];\n",
                 "autogen/starknet/external/isValidSignature/972efe4adb0e1cedbdf0f0747cf1e121111a6180229de74773d49a6e595c4f3d.cairo": "let ecdsa_ptr = [cast([cast(fp + (-5), felt**)] + 3, starkware.cairo.common.cairo_builtins.SignatureBuiltin**)];\n",
-                "autogen/starknet/external/isValidSignature/adf484e00673057feb7ddae544bf56c90ede82b41618516647b70e3ae5112edd.cairo": "let ret_value = __wrapped_func{syscall_ptr=syscall_ptr, pedersen_ptr=pedersen_ptr, range_check_ptr=range_check_ptr, ecdsa_ptr=ecdsa_ptr}(hash=__calldata_arg_hash, signature_len=__calldata_arg_signature_len, signature=__calldata_arg_signature,);\nlet (range_check_ptr, retdata_size, retdata) = isValidSignature_encode_return(ret_value, range_check_ptr);\n",
                 "autogen/starknet/external/isValidSignature/b2c52ca2d2a8fc8791a983086d8716c5eacd0c3d62934914d2286f84b98ff4cb.cairo": "let syscall_ptr = [cast([cast(fp + (-5), felt**)] + 0, felt**)];\n",
                 "autogen/starknet/external/isValidSignature/b363de5c884e054e373732fa94161084d4128000eba968c31dbb40d4ab78ae25.cairo": "return (syscall_ptr,pedersen_ptr,range_check_ptr,ecdsa_ptr,bitwise_ptr,retdata_size,retdata);\n",
+                "autogen/starknet/external/isValidSignature/dc25ac1b979358bf96523ef3405d0b0d9c7820971d203cff2e2c75e545e055cc.cairo": "let ret_value = __wrapped_func{syscall_ptr=syscall_ptr, pedersen_ptr=pedersen_ptr, ecdsa_ptr=ecdsa_ptr, range_check_ptr=range_check_ptr}(hash=__calldata_arg_hash, signature_len=__calldata_arg_signature_len, signature=__calldata_arg_signature,);\nlet (range_check_ptr, retdata_size, retdata) = isValidSignature_encode_return(ret_value, range_check_ptr);\n",
                 "autogen/starknet/external/return/__execute__/372012ab0384bb7289ee5ea400e8c2c07e9056ce02e109689ce1ae824183c43b.cairo": "func __execute___encode_return(ret_value: (response_len: felt, response: felt*), range_check_ptr) -> (\n        range_check_ptr: felt, data_len: felt, data: felt*) {\n    %{ memory[ap] = segments.add() %}\n    alloc_locals;\n    local __return_value_ptr_start: felt*;\n    let __return_value_ptr = __return_value_ptr_start;\n    with range_check_ptr {\n    }\n    return (\n        range_check_ptr=range_check_ptr,\n        data_len=__return_value_ptr - __return_value_ptr_start,\n        data=__return_value_ptr_start);\n}\n",
                 "autogen/starknet/external/return/getPublicKey/3b684397f6604a19c1ca2d5c5582ea20120aa5ea9a960892c6c6ecfc1b12fe56.cairo": "func getPublicKey_encode_return(ret_value: (publicKey: felt), range_check_ptr) -> (\n        range_check_ptr: felt, data_len: felt, data: felt*) {\n    %{ memory[ap] = segments.add() %}\n    alloc_locals;\n    local __return_value_ptr_start: felt*;\n    let __return_value_ptr = __return_value_ptr_start;\n    with range_check_ptr {\n    }\n    return (\n        range_check_ptr=range_check_ptr,\n        data_len=__return_value_ptr - __return_value_ptr_start,\n        data=__return_value_ptr_start);\n}\n",
                 "autogen/starknet/external/return/isValidSignature/788c6a8b6b18c5871daf6f002535597a864dc3acd6177843eee7ab2e36e975c5.cairo": "func isValidSignature_encode_return(ret_value: (isValid: felt), range_check_ptr) -> (\n        range_check_ptr: felt, data_len: felt, data: felt*) {\n    %{ memory[ap] = segments.add() %}\n    alloc_locals;\n    local __return_value_ptr_start: felt*;\n    let __return_value_ptr = __return_value_ptr_start;\n    with range_check_ptr {\n    }\n    return (\n        range_check_ptr=range_check_ptr,\n        data_len=__return_value_ptr - __return_value_ptr_start,\n        data=__return_value_ptr_start);\n}\n",
@@ -1115,9 +1065,7 @@
                 "autogen/starknet/external/supportsInterface/bca8209c591df9f65b13800fe22999fe396aef7f2e9ee72505ad6a9793c5916d.cairo": "let ret_value = __wrapped_func{syscall_ptr=syscall_ptr, pedersen_ptr=pedersen_ptr, range_check_ptr=range_check_ptr}(interfaceId=__calldata_arg_interfaceId,);\nlet (range_check_ptr, retdata_size, retdata) = supportsInterface_encode_return(ret_value, range_check_ptr);\n",
                 "autogen/starknet/external/supportsInterface/c6c4d3a7a58c6b37d5fdd51b25e5ab9f3e75174b411ab503db3ce03636ed6e2a.cairo": "let ecdsa_ptr = [cast([cast(fp + (-5), felt**)] + 3, felt*)];\n",
                 "autogen/starknet/storage_var/Account_public_key/decl.cairo": "namespace Account_public_key {\n    from starkware.starknet.common.storage import normalize_address\n    from starkware.starknet.common.syscalls import storage_read, storage_write\n    from starkware.cairo.common.cairo_builtins import HashBuiltin\n    from starkware.cairo.common.hash import hash2\n\n    func addr{pedersen_ptr: HashBuiltin*, range_check_ptr}() -> (res: felt) {\n        let res = 0;\n        call hash2;\n        call normalize_address;\n    }\n\n    func read{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}() -> (\n        public_key: felt\n    ) {\n        let storage_addr = 0;\n        call addr;\n        call storage_read;\n    }\n\n    func write{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}(value: felt) {\n        let storage_addr = 0;\n        call addr;\n        call storage_write;\n    }\n}",
-                "autogen/starknet/storage_var/Account_public_key/impl.cairo": "namespace Account_public_key {\n    from starkware.starknet.common.storage import normalize_address\n    from starkware.starknet.common.syscalls import storage_read, storage_write\n    from starkware.cairo.common.cairo_builtins import HashBuiltin\n    from starkware.cairo.common.hash import hash2\n\n    func addr{pedersen_ptr: HashBuiltin*, range_check_ptr}() -> (res: felt) {\n        let res = 550557492744938365112574611882025123252567779123164597803728068558738016655;\n        return (res=res);\n    }\n\n    func read{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}() -> (\n        public_key: felt\n    ) {\n        let (storage_addr) = addr();\n        let (__storage_var_temp0) = storage_read(address=storage_addr + 0);\n\n        tempvar syscall_ptr = syscall_ptr;\n        tempvar pedersen_ptr = pedersen_ptr;\n        tempvar range_check_ptr = range_check_ptr;\n        tempvar __storage_var_temp0: felt = __storage_var_temp0;\n        return ([cast(&__storage_var_temp0, felt*)],);\n    }\n\n    func write{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}(value: felt) {\n        let (storage_addr) = addr();\n        storage_write(address=storage_addr + 0, value=[cast(&value, felt) + 0]);\n        return ();\n    }\n}",
-                "autogen/starknet/storage_var/ERC165_supported_interfaces/decl.cairo": "namespace ERC165_supported_interfaces {\n    from starkware.starknet.common.storage import normalize_address\n    from starkware.starknet.common.syscalls import storage_read, storage_write\n    from starkware.cairo.common.cairo_builtins import HashBuiltin\n    from starkware.cairo.common.hash import hash2\n\n    func addr{pedersen_ptr: HashBuiltin*, range_check_ptr}(interface_id: felt) -> (res: felt) {\n        let res = 0;\n        call hash2;\n        call normalize_address;\n    }\n\n    func read{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}(\n        interface_id: felt\n    ) -> (is_supported: felt) {\n        let storage_addr = 0;\n        call addr;\n        call storage_read;\n    }\n\n    func write{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}(\n        interface_id: felt, value: felt\n    ) {\n        let storage_addr = 0;\n        call addr;\n        call storage_write;\n    }\n}",
-                "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo": "namespace ERC165_supported_interfaces {\n    from starkware.starknet.common.storage import normalize_address\n    from starkware.starknet.common.syscalls import storage_read, storage_write\n    from starkware.cairo.common.cairo_builtins import HashBuiltin\n    from starkware.cairo.common.hash import hash2\n\n    func addr{pedersen_ptr: HashBuiltin*, range_check_ptr}(interface_id: felt) -> (res: felt) {\n        let res = 479559987705328862372362947504386080106579713470203672197513890426980061174;\n        let (res) = hash2{hash_ptr=pedersen_ptr}(res, cast(&interface_id, felt*)[0]);\n        let (res) = normalize_address(addr=res);\n        return (res=res);\n    }\n\n    func read{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}(\n        interface_id: felt\n    ) -> (is_supported: felt) {\n        let (storage_addr) = addr(interface_id);\n        let (__storage_var_temp0) = storage_read(address=storage_addr + 0);\n\n        tempvar syscall_ptr = syscall_ptr;\n        tempvar pedersen_ptr = pedersen_ptr;\n        tempvar range_check_ptr = range_check_ptr;\n        tempvar __storage_var_temp0: felt = __storage_var_temp0;\n        return ([cast(&__storage_var_temp0, felt*)],);\n    }\n\n    func write{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}(\n        interface_id: felt, value: felt\n    ) {\n        let (storage_addr) = addr(interface_id);\n        storage_write(address=storage_addr + 0, value=[cast(&value, felt) + 0]);\n        return ();\n    }\n}"
+                "autogen/starknet/storage_var/Account_public_key/impl.cairo": "namespace Account_public_key {\n    from starkware.starknet.common.storage import normalize_address\n    from starkware.starknet.common.syscalls import storage_read, storage_write\n    from starkware.cairo.common.cairo_builtins import HashBuiltin\n    from starkware.cairo.common.hash import hash2\n\n    func addr{pedersen_ptr: HashBuiltin*, range_check_ptr}() -> (res: felt) {\n        let res = 550557492744938365112574611882025123252567779123164597803728068558738016655;\n        return (res=res);\n    }\n\n    func read{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}() -> (\n        public_key: felt\n    ) {\n        let (storage_addr) = addr();\n        let (__storage_var_temp0) = storage_read(address=storage_addr + 0);\n\n        tempvar syscall_ptr = syscall_ptr;\n        tempvar pedersen_ptr = pedersen_ptr;\n        tempvar range_check_ptr = range_check_ptr;\n        tempvar __storage_var_temp0: felt = __storage_var_temp0;\n        return ([cast(&__storage_var_temp0, felt*)],);\n    }\n\n    func write{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}(value: felt) {\n        let (storage_addr) = addr();\n        storage_write(address=storage_addr + 0, value=[cast(&value, felt) + 0]);\n        return ();\n    }\n}"
             },
             "instruction_locations": {
                 "0": {
@@ -1132,7 +1080,7 @@
                                 "end_col": 38,
                                 "end_line": 3,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/alloc.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/alloc.cairo"
                                 },
                                 "start_col": 5,
                                 "start_line": 3
@@ -1144,7 +1092,7 @@
                         "end_col": 12,
                         "end_line": 4,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/alloc.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/alloc.cairo"
                         },
                         "start_col": 5,
                         "start_line": 4
@@ -1161,7 +1109,7 @@
                         "end_col": 40,
                         "end_line": 5,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/alloc.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/alloc.cairo"
                         },
                         "start_col": 5,
                         "start_line": 5
@@ -1169,191 +1117,70 @@
                 },
                 "3": {
                     "accessible_scopes": [
-                        "starkware.cairo.common.hash",
-                        "starkware.cairo.common.hash.hash2"
+                        "starkware.cairo.common.memcpy",
+                        "starkware.cairo.common.memcpy.memcpy"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 19,
-                        "end_line": 14,
+                        "end_col": 7,
+                        "end_line": 8,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/hash.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/memcpy.cairo"
                         },
                         "start_col": 5,
-                        "start_line": 14
+                        "start_line": 8
                     }
                 },
-                "4": {
+                "5": {
                     "accessible_scopes": [
-                        "starkware.cairo.common.hash",
-                        "starkware.cairo.common.hash.hash2"
+                        "starkware.cairo.common.memcpy",
+                        "starkware.cairo.common.memcpy.memcpy"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
                         "end_col": 19,
-                        "end_line": 15,
+                        "end_line": 9,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/hash.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/memcpy.cairo"
                         },
-                        "start_col": 5,
-                        "start_line": 15
+                        "start_col": 9,
+                        "start_line": 9
                     }
                 },
-                "5": {
+                "6": {
                     "accessible_scopes": [
-                        "starkware.cairo.common.hash",
-                        "starkware.cairo.common.hash.hash2"
+                        "starkware.cairo.common.memcpy",
+                        "starkware.cairo.common.memcpy.memcpy"
                     ],
                     "flow_tracking_data": null,
-                    "hints": [],
+                    "hints": [
+                        {
+                            "location": {
+                                "end_col": 41,
+                                "end_line": 12,
+                                "input_file": {
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/memcpy.cairo"
+                                },
+                                "start_col": 5,
+                                "start_line": 12
+                            },
+                            "n_prefix_newlines": 0
+                        }
+                    ],
                     "inst": {
-                        "end_col": 47,
-                        "end_line": 17,
+                        "end_col": 23,
+                        "end_line": 2,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/hash.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/memcpy.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 34,
+                                "end_col": 38,
                                 "end_line": 13,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/hash.cairo"
-                                },
-                                "parent_location": [
-                                    {
-                                        "end_col": 28,
-                                        "end_line": 18,
-                                        "input_file": {
-                                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/hash.cairo"
-                                        },
-                                        "start_col": 5,
-                                        "start_line": 18
-                                    },
-                                    "While trying to retrieve the implicit argument 'hash_ptr' in:"
-                                ],
-                                "start_col": 12,
-                                "start_line": 13
-                            },
-                            "While expanding the reference 'hash_ptr' in:"
-                        ],
-                        "start_col": 20,
-                        "start_line": 17
-                    }
-                },
-                "7": {
-                    "accessible_scopes": [
-                        "starkware.cairo.common.hash",
-                        "starkware.cairo.common.hash.hash2"
-                    ],
-                    "flow_tracking_data": null,
-                    "hints": [],
-                    "inst": {
-                        "end_col": 33,
-                        "end_line": 16,
-                        "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/hash.cairo"
-                        },
-                        "parent_location": [
-                            {
-                                "end_col": 26,
-                                "end_line": 18,
-                                "input_file": {
-                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/hash.cairo"
-                                },
-                                "start_col": 20,
-                                "start_line": 18
-                            },
-                            "While expanding the reference 'result' in:"
-                        ],
-                        "start_col": 18,
-                        "start_line": 16
-                    }
-                },
-                "8": {
-                    "accessible_scopes": [
-                        "starkware.cairo.common.hash",
-                        "starkware.cairo.common.hash.hash2"
-                    ],
-                    "flow_tracking_data": null,
-                    "hints": [],
-                    "inst": {
-                        "end_col": 28,
-                        "end_line": 18,
-                        "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/hash.cairo"
-                        },
-                        "start_col": 5,
-                        "start_line": 18
-                    }
-                },
-                "9": {
-                    "accessible_scopes": [
-                        "starkware.cairo.common.memcpy",
-                        "starkware.cairo.common.memcpy.memcpy"
-                    ],
-                    "flow_tracking_data": null,
-                    "hints": [],
-                    "inst": {
-                        "end_col": 7,
-                        "end_line": 8,
-                        "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/memcpy.cairo"
-                        },
-                        "start_col": 5,
-                        "start_line": 8
-                    }
-                },
-                "11": {
-                    "accessible_scopes": [
-                        "starkware.cairo.common.memcpy",
-                        "starkware.cairo.common.memcpy.memcpy"
-                    ],
-                    "flow_tracking_data": null,
-                    "hints": [],
-                    "inst": {
-                        "end_col": 19,
-                        "end_line": 9,
-                        "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/memcpy.cairo"
-                        },
-                        "start_col": 9,
-                        "start_line": 9
-                    }
-                },
-                "12": {
-                    "accessible_scopes": [
-                        "starkware.cairo.common.memcpy",
-                        "starkware.cairo.common.memcpy.memcpy"
-                    ],
-                    "flow_tracking_data": null,
-                    "hints": [
-                        {
-                            "location": {
-                                "end_col": 41,
-                                "end_line": 12,
-                                "input_file": {
-                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/memcpy.cairo"
-                                },
-                                "start_col": 5,
-                                "start_line": 12
-                            },
-                            "n_prefix_newlines": 0
-                        }
-                    ],
-                    "inst": {
-                        "end_col": 23,
-                        "end_line": 2,
-                        "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/memcpy.cairo"
-                        },
-                        "parent_location": [
-                            {
-                                "end_col": 38,
-                                "end_line": 13,
-                                "input_file": {
-                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/memcpy.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/memcpy.cairo"
                                 },
                                 "start_col": 35,
                                 "start_line": 13
@@ -1364,7 +1191,7 @@
                         "start_line": 2
                     }
                 },
-                "13": {
+                "7": {
                     "accessible_scopes": [
                         "starkware.cairo.common.memcpy",
                         "starkware.cairo.common.memcpy.memcpy"
@@ -1375,14 +1202,14 @@
                         "end_col": 35,
                         "end_line": 2,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/memcpy.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/memcpy.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 47,
                                 "end_line": 13,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/memcpy.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/memcpy.cairo"
                                 },
                                 "start_col": 44,
                                 "start_line": 13
@@ -1393,7 +1220,7 @@
                         "start_line": 2
                     }
                 },
-                "14": {
+                "8": {
                     "accessible_scopes": [
                         "starkware.cairo.common.memcpy",
                         "starkware.cairo.common.memcpy.memcpy"
@@ -1404,13 +1231,13 @@
                         "end_col": 37,
                         "end_line": 17,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/memcpy.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/memcpy.cairo"
                         },
                         "start_col": 26,
                         "start_line": 17
                     }
                 },
-                "15": {
+                "9": {
                     "accessible_scopes": [
                         "starkware.cairo.common.memcpy",
                         "starkware.cairo.common.memcpy.memcpy"
@@ -1421,13 +1248,13 @@
                         "end_col": 38,
                         "end_line": 17,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/memcpy.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/memcpy.cairo"
                         },
                         "start_col": 5,
                         "start_line": 17
                     }
                 },
-                "16": {
+                "10": {
                     "accessible_scopes": [
                         "starkware.cairo.common.memcpy",
                         "starkware.cairo.common.memcpy.memcpy"
@@ -1438,13 +1265,13 @@
                         "end_col": 41,
                         "end_line": 22,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/memcpy.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/memcpy.cairo"
                         },
                         "start_col": 5,
                         "start_line": 22
                     }
                 },
-                "18": {
+                "12": {
                     "accessible_scopes": [
                         "starkware.cairo.common.memcpy",
                         "starkware.cairo.common.memcpy.memcpy"
@@ -1455,13 +1282,13 @@
                         "end_col": 41,
                         "end_line": 23,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/memcpy.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/memcpy.cairo"
                         },
                         "start_col": 5,
                         "start_line": 23
                     }
                 },
-                "20": {
+                "14": {
                     "accessible_scopes": [
                         "starkware.cairo.common.memcpy",
                         "starkware.cairo.common.memcpy.memcpy"
@@ -1473,7 +1300,7 @@
                                 "end_col": 7,
                                 "end_line": 27,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/memcpy.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/memcpy.cairo"
                                 },
                                 "start_col": 5,
                                 "start_line": 24
@@ -1485,13 +1312,13 @@
                         "end_col": 44,
                         "end_line": 29,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/memcpy.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/memcpy.cairo"
                         },
                         "start_col": 5,
                         "start_line": 29
                     }
                 },
-                "22": {
+                "16": {
                     "accessible_scopes": [
                         "starkware.cairo.common.memcpy",
                         "starkware.cairo.common.memcpy.memcpy"
@@ -1502,13 +1329,13 @@
                         "end_col": 55,
                         "end_line": 31,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/memcpy.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/memcpy.cairo"
                         },
                         "start_col": 5,
                         "start_line": 31
                     }
                 },
-                "23": {
+                "17": {
                     "accessible_scopes": [
                         "starkware.cairo.common.memcpy",
                         "starkware.cairo.common.memcpy.memcpy"
@@ -1520,7 +1347,7 @@
                                 "end_col": 26,
                                 "end_line": 33,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/memcpy.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/memcpy.cairo"
                                 },
                                 "start_col": 5,
                                 "start_line": 33
@@ -1532,956 +1359,912 @@
                         "end_col": 15,
                         "end_line": 34,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/memcpy.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/memcpy.cairo"
                         },
                         "start_col": 5,
                         "start_line": 34
                     }
                 },
-                "24": {
+                "18": {
                     "accessible_scopes": [
                         "starkware.cairo.common.math",
-                        "starkware.cairo.common.math.assert_not_equal"
+                        "starkware.cairo.common.math.assert_le_felt"
                     ],
                     "flow_tracking_data": null,
                     "hints": [
                         {
                             "location": {
                                 "end_col": 7,
-                                "end_line": 31,
+                                "end_line": 184,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
                                 },
                                 "start_col": 5,
-                                "start_line": 22
+                                "start_line": 164
                             },
                             "n_prefix_newlines": 1
                         }
                     ],
                     "inst": {
-                        "end_col": 15,
-                        "end_line": 32,
+                        "end_col": 42,
+                        "end_line": 186,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
                         },
-                        "start_col": 9,
-                        "start_line": 32
+                        "start_col": 25,
+                        "start_line": 186
                     }
                 },
-                "25": {
+                "19": {
                     "accessible_scopes": [
                         "starkware.cairo.common.math",
-                        "starkware.cairo.common.math.assert_not_equal"
+                        "starkware.cairo.common.math.assert_le_felt"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 7,
-                        "end_line": 32,
+                        "end_col": 66,
+                        "end_line": 186,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
                         },
-                        "start_col": 5,
-                        "start_line": 32
+                        "start_col": 45,
+                        "start_line": 186
                     }
                 },
-                "27": {
+                "20": {
                     "accessible_scopes": [
                         "starkware.cairo.common.math",
-                        "starkware.cairo.common.math.assert_not_equal"
+                        "starkware.cairo.common.math.assert_le_felt"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 18,
-                        "end_line": 34,
+                        "end_col": 86,
+                        "end_line": 186,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
                         },
-                        "start_col": 9,
-                        "start_line": 34
+                        "start_col": 45,
+                        "start_line": 186
                     }
                 },
-                "29": {
+                "22": {
                     "accessible_scopes": [
                         "starkware.cairo.common.math",
-                        "starkware.cairo.common.math.assert_not_equal"
+                        "starkware.cairo.common.math.assert_le_felt"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 15,
-                        "end_line": 37,
+                        "end_col": 86,
+                        "end_line": 186,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
                         },
-                        "start_col": 5,
-                        "start_line": 37
+                        "start_col": 25,
+                        "start_line": 186
                     }
                 },
-                "30": {
+                "23": {
                     "accessible_scopes": [
                         "starkware.cairo.common.math",
-                        "starkware.cairo.common.math.assert_250_bit"
+                        "starkware.cairo.common.math.assert_le_felt"
                     ],
                     "flow_tracking_data": null,
-                    "hints": [
-                        {
-                            "location": {
-                                "end_col": 7,
-                                "end_line": 106,
-                                "input_file": {
-                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
-                                },
-                                "start_col": 5,
-                                "start_line": 97
-                            },
-                            "n_prefix_newlines": 1
-                        }
-                    ],
+                    "hints": [],
                     "inst": {
-                        "end_col": 50,
-                        "end_line": 108,
+                        "end_col": 45,
+                        "end_line": 187,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
                         },
-                        "start_col": 36,
-                        "start_line": 108
+                        "start_col": 24,
+                        "start_line": 187
                     }
                 },
-                "32": {
+                "24": {
                     "accessible_scopes": [
                         "starkware.cairo.common.math",
-                        "starkware.cairo.common.math.assert_250_bit"
+                        "starkware.cairo.common.math.assert_le_felt"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 37,
-                        "end_line": 95,
+                        "end_col": 69,
+                        "end_line": 187,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
                         },
-                        "parent_location": [
-                            {
-                                "end_col": 57,
-                                "end_line": 108,
-                                "input_file": {
-                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
-                                },
-                                "start_col": 53,
-                                "start_line": 108
-                            },
-                            "While expanding the reference 'high' in:"
-                        ],
-                        "start_col": 16,
-                        "start_line": 95
+                        "start_col": 48,
+                        "start_line": 187
                     }
                 },
-                "33": {
+                "25": {
                     "accessible_scopes": [
                         "starkware.cairo.common.math",
-                        "starkware.cairo.common.math.assert_250_bit"
+                        "starkware.cairo.common.math.assert_le_felt"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 57,
-                        "end_line": 108,
+                        "end_col": 89,
+                        "end_line": 187,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
                         },
-                        "start_col": 36,
-                        "start_line": 108
+                        "start_col": 48,
+                        "start_line": 187
                     }
                 },
-                "34": {
+                "27": {
                     "accessible_scopes": [
                         "starkware.cairo.common.math",
-                        "starkware.cairo.common.math.assert_250_bit"
+                        "starkware.cairo.common.math.assert_le_felt"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 58,
-                        "end_line": 108,
+                        "end_col": 89,
+                        "end_line": 187,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
                         },
-                        "start_col": 5,
-                        "start_line": 108
+                        "start_col": 24,
+                        "start_line": 187
                     }
                 },
-                "35": {
+                "28": {
                     "accessible_scopes": [
                         "starkware.cairo.common.math",
-                        "starkware.cairo.common.math.assert_250_bit"
+                        "starkware.cairo.common.math.assert_le_felt"
                     ],
                     "flow_tracking_data": null,
-                    "hints": [],
-                    "inst": {
-                        "end_col": 37,
-                        "end_line": 95,
-                        "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
-                        },
-                        "parent_location": [
-                            {
-                                "end_col": 24,
-                                "end_line": 113,
+                    "hints": [
+                        {
+                            "location": {
+                                "end_col": 49,
+                                "end_line": 196,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
                                 },
-                                "start_col": 20,
-                                "start_line": 113
+                                "start_col": 5,
+                                "start_line": 196
                             },
-                            "While expanding the reference 'high' in:"
-                        ],
-                        "start_col": 16,
-                        "start_line": 95
+                            "n_prefix_newlines": 0
+                        }
+                    ],
+                    "inst": {
+                        "end_col": 42,
+                        "end_line": 197,
+                        "input_file": {
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                        },
+                        "start_col": 5,
+                        "start_line": 197
                     }
                 },
-                "36": {
+                "30": {
                     "accessible_scopes": [
                         "starkware.cairo.common.math",
-                        "starkware.cairo.common.math.assert_250_bit"
+                        "starkware.cairo.common.math.assert_le_felt"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 32,
-                        "end_line": 113,
+                        "end_col": 25,
+                        "end_line": 198,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
                         },
-                        "start_col": 20,
-                        "start_line": 113
+                        "start_col": 23,
+                        "start_line": 198
                     }
                 },
-                "38": {
+                "32": {
                     "accessible_scopes": [
                         "starkware.cairo.common.math",
-                        "starkware.cairo.common.math.assert_250_bit"
+                        "starkware.cairo.common.math.assert_le_felt"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 32,
-                        "end_line": 94,
+                        "end_col": 30,
+                        "end_line": 198,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
                         },
-                        "parent_location": [
-                            {
-                                "end_col": 38,
-                                "end_line": 113,
-                                "input_file": {
-                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
-                                },
-                                "start_col": 35,
-                                "start_line": 113
-                            },
-                            "While expanding the reference 'low' in:"
-                        ],
-                        "start_col": 15,
-                        "start_line": 94
+                        "start_col": 22,
+                        "start_line": 198
                     }
                 },
-                "39": {
+                "33": {
                     "accessible_scopes": [
                         "starkware.cairo.common.math",
-                        "starkware.cairo.common.math.assert_250_bit"
+                        "starkware.cairo.common.math.assert_le_felt"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 39,
-                        "end_line": 113,
+                        "end_col": 31,
+                        "end_line": 198,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
                         },
                         "start_col": 5,
-                        "start_line": 113
+                        "start_line": 198
                     }
                 },
-                "40": {
+                "34": {
                     "accessible_scopes": [
                         "starkware.cairo.common.math",
-                        "starkware.cairo.common.math.assert_250_bit"
+                        "starkware.cairo.common.math.assert_le_felt"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 46,
-                        "end_line": 115,
+                        "end_col": 29,
+                        "end_line": 199,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
                         },
-                        "parent_location": [
-                            {
-                                "end_col": 36,
-                                "end_line": 89,
-                                "input_file": {
-                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
-                                },
-                                "parent_location": [
-                                    {
-                                        "end_col": 15,
-                                        "end_line": 116,
-                                        "input_file": {
-                                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
-                                        },
-                                        "start_col": 5,
-                                        "start_line": 116
-                                    },
-                                    "While trying to retrieve the implicit argument 'range_check_ptr' in:"
-                                ],
-                                "start_col": 21,
-                                "start_line": 89
-                            },
-                            "While expanding the reference 'range_check_ptr' in:"
-                        ],
-                        "start_col": 27,
-                        "start_line": 115
+                        "start_col": 24,
+                        "start_line": 199
                     }
                 },
-                "42": {
+                "35": {
                     "accessible_scopes": [
                         "starkware.cairo.common.math",
-                        "starkware.cairo.common.math.assert_250_bit"
+                        "starkware.cairo.common.math.assert_le_felt"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 15,
-                        "end_line": 116,
+                        "end_col": 39,
+                        "end_line": 199,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
                         },
-                        "start_col": 5,
-                        "start_line": 116
+                        "start_col": 34,
+                        "start_line": 199
                     }
                 },
-                "43": {
+                "37": {
                     "accessible_scopes": [
-                        "starkware.starknet.common.storage",
-                        "starkware.starknet.common.storage.normalize_address"
+                        "starkware.cairo.common.math",
+                        "starkware.cairo.common.math.assert_le_felt"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 22,
-                        "end_line": 13,
+                        "end_col": 40,
+                        "end_line": 199,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/storage.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
                         },
-                        "start_col": 5,
-                        "start_line": 13
+                        "start_col": 23,
+                        "start_line": 199
                     }
                 },
-                "45": {
+                "38": {
                     "accessible_scopes": [
-                        "starkware.starknet.common.storage",
-                        "starkware.starknet.common.storage.normalize_address"
+                        "starkware.cairo.common.math",
+                        "starkware.cairo.common.math.assert_le_felt"
                     ],
                     "flow_tracking_data": null,
-                    "hints": [
-                        {
-                            "location": {
-                                "end_col": 7,
-                                "end_line": 21,
-                                "input_file": {
-                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/storage.cairo"
-                                },
-                                "start_col": 5,
-                                "start_line": 14
-                            },
-                            "n_prefix_newlines": 1
-                        }
-                    ],
+                    "hints": [],
                     "inst": {
-                        "end_col": 7,
-                        "end_line": 22,
+                        "end_col": 41,
+                        "end_line": 199,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/storage.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
                         },
                         "start_col": 5,
-                        "start_line": 22
+                        "start_line": 199
                     }
                 },
-                "47": {
+                "39": {
                     "accessible_scopes": [
-                        "starkware.starknet.common.storage",
-                        "starkware.starknet.common.storage.normalize_address"
+                        "starkware.cairo.common.math",
+                        "starkware.cairo.common.math.assert_le_felt"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 39,
-                        "end_line": 12,
+                        "end_col": 46,
+                        "end_line": 188,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/storage.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 36,
-                                "end_line": 89,
+                                "end_line": 154,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 26,
-                                        "end_line": 50,
+                                        "end_col": 15,
+                                        "end_line": 200,
                                         "input_file": {
-                                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/storage.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
                                         },
-                                        "start_col": 9,
-                                        "start_line": 50
+                                        "start_col": 5,
+                                        "start_line": 200
                                     },
                                     "While trying to retrieve the implicit argument 'range_check_ptr' in:"
                                 ],
                                 "start_col": 21,
-                                "start_line": 89
+                                "start_line": 154
                             },
                             "While expanding the reference 'range_check_ptr' in:"
                         ],
-                        "start_col": 24,
-                        "start_line": 12
+                        "start_col": 27,
+                        "start_line": 188
                     }
                 },
-                "48": {
+                "41": {
                     "accessible_scopes": [
-                        "starkware.starknet.common.storage",
-                        "starkware.starknet.common.storage.normalize_address"
+                        "starkware.cairo.common.math",
+                        "starkware.cairo.common.math.assert_le_felt"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 34,
-                        "end_line": 48,
+                        "end_col": 15,
+                        "end_line": 200,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/storage.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
                         },
-                        "parent_location": [
-                            {
-                                "end_col": 25,
-                                "end_line": 50,
-                                "input_file": {
-                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/storage.cairo"
-                                },
-                                "start_col": 24,
-                                "start_line": 50
-                            },
-                            "While expanding the reference 'x' in:"
-                        ],
-                        "start_col": 17,
-                        "start_line": 48
+                        "start_col": 5,
+                        "start_line": 200
                     }
                 },
-                "50": {
+                "42": {
                     "accessible_scopes": [
-                        "starkware.starknet.common.storage",
-                        "starkware.starknet.common.storage.normalize_address"
+                        "starkware.cairo.common.math",
+                        "starkware.cairo.common.math.assert_le_felt"
                     ],
                     "flow_tracking_data": null,
-                    "hints": [],
+                    "hints": [
+                        {
+                            "location": {
+                                "end_col": 49,
+                                "end_line": 204,
+                                "input_file": {
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                                },
+                                "start_col": 5,
+                                "start_line": 204
+                            },
+                            "n_prefix_newlines": 0
+                        }
+                    ],
                     "inst": {
-                        "end_col": 26,
-                        "end_line": 50,
+                        "end_col": 50,
+                        "end_line": 205,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/storage.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
                         },
-                        "start_col": 9,
-                        "start_line": 50
+                        "start_col": 5,
+                        "start_line": 205
                     }
                 },
-                "52": {
+                "44": {
                     "accessible_scopes": [
-                        "starkware.starknet.common.storage",
-                        "starkware.starknet.common.storage.normalize_address"
+                        "starkware.cairo.common.math",
+                        "starkware.cairo.common.math.assert_le_felt"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 20,
-                        "end_line": 49,
+                        "end_col": 23,
+                        "end_line": 206,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/storage.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
                         },
-                        "parent_location": [
-                            {
-                                "end_col": 25,
-                                "end_line": 51,
-                                "input_file": {
-                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/storage.cairo"
-                                },
-                                "start_col": 24,
-                                "start_line": 51
-                            },
-                            "While expanding the reference 'y' in:"
-                        ],
-                        "start_col": 18,
-                        "start_line": 49
+                        "start_col": 21,
+                        "start_line": 206
                     }
                 },
-                "54": {
+                "46": {
                     "accessible_scopes": [
-                        "starkware.starknet.common.storage",
-                        "starkware.starknet.common.storage.normalize_address"
+                        "starkware.cairo.common.math",
+                        "starkware.cairo.common.math.assert_le_felt"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 36,
-                        "end_line": 89,
+                        "end_col": 28,
+                        "end_line": 206,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
                         },
-                        "parent_location": [
-                            {
-                                "end_col": 26,
-                                "end_line": 50,
-                                "input_file": {
-                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/storage.cairo"
-                                },
-                                "parent_location": [
-                                    {
-                                        "end_col": 36,
-                                        "end_line": 89,
-                                        "input_file": {
-                                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
-                                        },
-                                        "parent_location": [
-                                            {
-                                                "end_col": 26,
-                                                "end_line": 51,
-                                                "input_file": {
-                                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/storage.cairo"
-                                                },
-                                                "start_col": 9,
-                                                "start_line": 51
-                                            },
-                                            "While trying to retrieve the implicit argument 'range_check_ptr' in:"
-                                        ],
-                                        "start_col": 21,
-                                        "start_line": 89
-                                    },
-                                    "While expanding the reference 'range_check_ptr' in:"
-                                ],
-                                "start_col": 9,
-                                "start_line": 50
-                            },
-                            "While trying to update the implicit return value 'range_check_ptr' in:"
-                        ],
-                        "start_col": 21,
-                        "start_line": 89
+                        "start_col": 20,
+                        "start_line": 206
                     }
                 },
-                "55": {
+                "47": {
                     "accessible_scopes": [
-                        "starkware.starknet.common.storage",
-                        "starkware.starknet.common.storage.normalize_address"
+                        "starkware.cairo.common.math",
+                        "starkware.cairo.common.math.assert_le_felt"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 28,
-                        "end_line": 49,
+                        "end_col": 30,
+                        "end_line": 207,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/storage.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
                         },
-                        "parent_location": [
-                            {
-                                "end_col": 25,
-                                "end_line": 51,
-                                "input_file": {
-                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/storage.cairo"
-                                },
-                                "start_col": 24,
-                                "start_line": 51
-                            },
-                            "While expanding the reference 'y' in:"
-                        ],
-                        "start_col": 17,
-                        "start_line": 49
+                        "start_col": 22,
+                        "start_line": 207
                     }
                 },
-                "56": {
+                "48": {
                     "accessible_scopes": [
-                        "starkware.starknet.common.storage",
-                        "starkware.starknet.common.storage.normalize_address"
+                        "starkware.cairo.common.math",
+                        "starkware.cairo.common.math.assert_le_felt"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 26,
-                        "end_line": 51,
+                        "end_col": 31,
+                        "end_line": 207,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/storage.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
                         },
-                        "start_col": 9,
-                        "start_line": 51
+                        "start_col": 5,
+                        "start_line": 207
                     }
                 },
-                "58": {
+                "49": {
                     "accessible_scopes": [
-                        "starkware.starknet.common.storage",
-                        "starkware.starknet.common.storage.normalize_address"
+                        "starkware.cairo.common.math",
+                        "starkware.cairo.common.math.assert_le_felt"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 38,
-                        "end_line": 52,
+                        "end_col": 31,
+                        "end_line": 208,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/storage.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
                         },
-                        "start_col": 21,
-                        "start_line": 52
+                        "start_col": 23,
+                        "start_line": 208
                     }
                 },
-                "60": {
+                "50": {
                     "accessible_scopes": [
-                        "starkware.starknet.common.storage",
-                        "starkware.starknet.common.storage.normalize_address"
+                        "starkware.cairo.common.math",
+                        "starkware.cairo.common.math.assert_le_felt"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 40,
-                        "end_line": 52,
+                        "end_col": 32,
+                        "end_line": 208,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/storage.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
                         },
-                        "start_col": 9,
-                        "start_line": 52
+                        "start_col": 5,
+                        "start_line": 208
                     }
                 },
-                "61": {
+                "51": {
                     "accessible_scopes": [
-                        "starkware.starknet.common.storage",
-                        "starkware.starknet.common.storage.normalize_address"
+                        "starkware.cairo.common.math",
+                        "starkware.cairo.common.math.assert_le_felt"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 24,
-                        "end_line": 23,
+                        "end_col": 46,
+                        "end_line": 188,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/storage.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
                         },
-                        "start_col": 9,
-                        "start_line": 23
-                    }
-                },
-                "63": {
-                    "accessible_scopes": [
-                        "starkware.starknet.common.storage",
-                        "starkware.starknet.common.storage.normalize_address"
-                    ],
-                    "flow_tracking_data": null,
-                    "hints": [
-                        {
-                            "location": {
-                                "end_col": 57,
-                                "end_line": 24,
+                        "parent_location": [
+                            {
+                                "end_col": 36,
+                                "end_line": 154,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/storage.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
                                 },
-                                "start_col": 9,
-                                "start_line": 24
-                            },
+                                "parent_location": [
+                                    {
+                                        "end_col": 15,
+                                        "end_line": 209,
+                                        "input_file": {
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                                        },
+                                        "start_col": 5,
+                                        "start_line": 209
+                                    },
+                                    "While trying to retrieve the implicit argument 'range_check_ptr' in:"
+                                ],
+                                "start_col": 21,
+                                "start_line": 154
+                            },
+                            "While expanding the reference 'range_check_ptr' in:"
+                        ],
+                        "start_col": 27,
+                        "start_line": 188
+                    }
+                },
+                "53": {
+                    "accessible_scopes": [
+                        "starkware.cairo.common.math",
+                        "starkware.cairo.common.math.assert_le_felt"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 15,
+                        "end_line": 209,
+                        "input_file": {
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                        },
+                        "start_col": 5,
+                        "start_line": 209
+                    }
+                },
+                "54": {
+                    "accessible_scopes": [
+                        "starkware.cairo.common.math",
+                        "starkware.cairo.common.math.assert_le_felt"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [
+                        {
+                            "location": {
+                                "end_col": 31,
+                                "end_line": 213,
+                                "input_file": {
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                                },
+                                "start_col": 5,
+                                "start_line": 213
+                            },
                             "n_prefix_newlines": 0
                         }
                     ],
                     "inst": {
-                        "end_col": 11,
-                        "end_line": 25,
+                        "end_col": 24,
+                        "end_line": 214,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/storage.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
                         },
-                        "start_col": 9,
-                        "start_line": 25
+                        "start_col": 5,
+                        "start_line": 214
                     }
                 },
-                "65": {
+                "55": {
                     "accessible_scopes": [
-                        "starkware.starknet.common.storage",
-                        "starkware.starknet.common.storage.normalize_address"
+                        "starkware.cairo.common.math",
+                        "starkware.cairo.common.math.assert_le_felt"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 21,
-                        "end_line": 30,
+                        "end_col": 33,
+                        "end_line": 215,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/storage.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
                         },
-                        "start_col": 13,
-                        "start_line": 30
+                        "start_col": 28,
+                        "start_line": 215
                     }
                 },
-                "67": {
+                "56": {
                     "accessible_scopes": [
-                        "starkware.starknet.common.storage",
-                        "starkware.starknet.common.storage.normalize_address"
+                        "starkware.cairo.common.math",
+                        "starkware.cairo.common.math.assert_le_felt"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 42,
-                        "end_line": 32,
+                        "end_col": 34,
+                        "end_line": 215,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/storage.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
                         },
-                        "start_col": 28,
-                        "start_line": 32
+                        "start_col": 23,
+                        "start_line": 215
                     }
                 },
-                "69": {
+                "57": {
                     "accessible_scopes": [
-                        "starkware.starknet.common.storage",
-                        "starkware.starknet.common.storage.normalize_address"
+                        "starkware.cairo.common.math",
+                        "starkware.cairo.common.math.assert_le_felt"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 39,
-                        "end_line": 12,
+                        "end_col": 35,
+                        "end_line": 215,
+                        "input_file": {
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                        },
+                        "start_col": 5,
+                        "start_line": 215
+                    }
+                },
+                "58": {
+                    "accessible_scopes": [
+                        "starkware.cairo.common.math",
+                        "starkware.cairo.common.math.assert_le_felt"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 12,
+                        "end_line": 216,
+                        "input_file": {
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                        },
+                        "start_col": 5,
+                        "start_line": 216
+                    }
+                },
+                "60": {
+                    "accessible_scopes": [
+                        "starkware.cairo.common.math",
+                        "starkware.cairo.common.math.assert_le_felt"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 46,
+                        "end_line": 188,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/storage.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 36,
-                                "end_line": 89,
+                                "end_line": 154,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 50,
-                                        "end_line": 32,
+                                        "end_col": 15,
+                                        "end_line": 217,
                                         "input_file": {
-                                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/storage.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
                                         },
-                                        "start_col": 13,
-                                        "start_line": 32
+                                        "start_col": 5,
+                                        "start_line": 217
                                     },
                                     "While trying to retrieve the implicit argument 'range_check_ptr' in:"
                                 ],
                                 "start_col": 21,
-                                "start_line": 89
+                                "start_line": 154
                             },
                             "While expanding the reference 'range_check_ptr' in:"
                         ],
-                        "start_col": 24,
-                        "start_line": 12
+                        "start_col": 27,
+                        "start_line": 188
                     }
                 },
-                "70": {
+                "62": {
                     "accessible_scopes": [
-                        "starkware.starknet.common.storage",
-                        "starkware.starknet.common.storage.normalize_address"
+                        "starkware.cairo.common.math",
+                        "starkware.cairo.common.math.assert_le_felt"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 49,
-                        "end_line": 32,
+                        "end_col": 15,
+                        "end_line": 217,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/storage.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
                         },
-                        "start_col": 28,
-                        "start_line": 32
+                        "start_col": 5,
+                        "start_line": 217
                     }
                 },
-                "71": {
+                "63": {
                     "accessible_scopes": [
-                        "starkware.starknet.common.storage",
-                        "starkware.starknet.common.storage.normalize_address"
+                        "starkware.cairo.common.math",
+                        "starkware.cairo.common.math.assert_lt_felt"
                     ],
                     "flow_tracking_data": null,
-                    "hints": [],
+                    "hints": [
+                        {
+                            "location": {
+                                "end_col": 7,
+                                "end_line": 230,
+                                "input_file": {
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                                },
+                                "start_col": 5,
+                                "start_line": 224
+                            },
+                            "n_prefix_newlines": 1
+                        }
+                    ],
                     "inst": {
-                        "end_col": 50,
-                        "end_line": 32,
+                        "end_col": 15,
+                        "end_line": 231,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/storage.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
                         },
-                        "start_col": 13,
-                        "start_line": 32
+                        "start_col": 9,
+                        "start_line": 231
                     }
                 },
-                "73": {
+                "64": {
                     "accessible_scopes": [
-                        "starkware.starknet.common.storage",
-                        "starkware.starknet.common.storage.normalize_address"
+                        "starkware.cairo.common.math",
+                        "starkware.cairo.common.math.assert_lt_felt"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 11,
-                        "end_line": 25,
+                        "end_col": 7,
+                        "end_line": 231,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/storage.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
                         },
-                        "start_col": 9,
-                        "start_line": 25
+                        "start_col": 5,
+                        "start_line": 231
                     }
                 },
-                "75": {
+                "66": {
                     "accessible_scopes": [
-                        "starkware.starknet.common.storage",
-                        "starkware.starknet.common.storage.normalize_address"
+                        "starkware.cairo.common.math",
+                        "starkware.cairo.common.math.assert_lt_felt"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 21,
-                        "end_line": 26,
+                        "end_col": 18,
+                        "end_line": 233,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/storage.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
                         },
-                        "start_col": 13,
-                        "start_line": 26
+                        "start_col": 9,
+                        "start_line": 233
                     }
                 },
-                "77": {
+                "68": {
                     "accessible_scopes": [
-                        "starkware.starknet.common.storage",
-                        "starkware.starknet.common.storage.normalize_address"
+                        "starkware.cairo.common.math",
+                        "starkware.cairo.common.math.assert_lt_felt"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 39,
-                        "end_line": 12,
+                        "end_col": 36,
+                        "end_line": 223,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/storage.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 36,
-                                "end_line": 89,
+                                "end_line": 154,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 33,
-                                        "end_line": 28,
+                                        "end_col": 25,
+                                        "end_line": 235,
                                         "input_file": {
-                                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/storage.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
                                         },
-                                        "start_col": 13,
-                                        "start_line": 28
+                                        "start_col": 5,
+                                        "start_line": 235
                                     },
                                     "While trying to retrieve the implicit argument 'range_check_ptr' in:"
                                 ],
                                 "start_col": 21,
-                                "start_line": 89
+                                "start_line": 154
                             },
                             "While expanding the reference 'range_check_ptr' in:"
                         ],
-                        "start_col": 24,
-                        "start_line": 12
+                        "start_col": 21,
+                        "start_line": 223
                     }
                 },
-                "78": {
+                "69": {
                     "accessible_scopes": [
-                        "starkware.starknet.common.storage",
-                        "starkware.starknet.common.storage.normalize_address"
+                        "starkware.cairo.common.math",
+                        "starkware.cairo.common.math.assert_lt_felt"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 51,
-                        "end_line": 12,
+                        "end_col": 39,
+                        "end_line": 223,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/storage.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 32,
-                                "end_line": 28,
+                                "end_col": 21,
+                                "end_line": 235,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/storage.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
                                 },
-                                "start_col": 28,
-                                "start_line": 28
+                                "start_col": 20,
+                                "start_line": 235
                             },
-                            "While expanding the reference 'addr' in:"
+                            "While expanding the reference 'a' in:"
                         ],
-                        "start_col": 41,
-                        "start_line": 12
+                        "start_col": 38,
+                        "start_line": 223
                     }
                 },
-                "79": {
+                "70": {
                     "accessible_scopes": [
-                        "starkware.starknet.common.storage",
-                        "starkware.starknet.common.storage.normalize_address"
+                        "starkware.cairo.common.math",
+                        "starkware.cairo.common.math.assert_lt_felt"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 33,
-                        "end_line": 28,
+                        "end_col": 42,
+                        "end_line": 223,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/storage.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
                         },
-                        "start_col": 13,
-                        "start_line": 28
+                        "parent_location": [
+                            {
+                                "end_col": 24,
+                                "end_line": 235,
+                                "input_file": {
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                                },
+                                "start_col": 23,
+                                "start_line": 235
+                            },
+                            "While expanding the reference 'b' in:"
+                        ],
+                        "start_col": 41,
+                        "start_line": 223
                     }
                 },
-                "81": {
+                "71": {
                     "accessible_scopes": [
-                        "starkware.starknet.common.storage",
-                        "starkware.starknet.common.storage.normalize_address"
+                        "starkware.cairo.common.math",
+                        "starkware.cairo.common.math.assert_lt_felt"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 51,
-                        "end_line": 12,
+                        "end_col": 25,
+                        "end_line": 235,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/storage.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
                         },
-                        "parent_location": [
-                            {
-                                "end_col": 25,
-                                "end_line": 34,
-                                "input_file": {
-                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/storage.cairo"
-                                },
-                                "start_col": 21,
-                                "start_line": 34
-                            },
-                            "While expanding the reference 'addr' in:"
-                        ],
-                        "start_col": 41,
-                        "start_line": 12
+                        "start_col": 5,
+                        "start_line": 235
                     }
                 },
-                "82": {
+                "73": {
                     "accessible_scopes": [
-                        "starkware.starknet.common.storage",
-                        "starkware.starknet.common.storage.normalize_address"
+                        "starkware.cairo.common.math",
+                        "starkware.cairo.common.math.assert_lt_felt"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 27,
-                        "end_line": 34,
+                        "end_col": 15,
+                        "end_line": 236,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/storage.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
                         },
-                        "start_col": 9,
-                        "start_line": 34
+                        "start_col": 5,
+                        "start_line": 236
                     }
                 },
-                "83": {
+                "74": {
                     "accessible_scopes": [
                         "starkware.starknet.common.syscalls",
                         "starkware.starknet.common.syscalls.call_contract"
@@ -2492,13 +2275,13 @@
                         "end_col": 40,
                         "end_line": 47,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 18,
                         "start_line": 47
                     }
                 },
-                "85": {
+                "76": {
                     "accessible_scopes": [
                         "starkware.starknet.common.syscalls",
                         "starkware.starknet.common.syscalls.call_contract"
@@ -2509,13 +2292,13 @@
                         "end_col": 28,
                         "end_line": 51,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 5,
                         "start_line": 46
                     }
                 },
-                "86": {
+                "77": {
                     "accessible_scopes": [
                         "starkware.starknet.common.syscalls",
                         "starkware.starknet.common.syscalls.call_contract"
@@ -2526,13 +2309,13 @@
                         "end_col": 28,
                         "end_line": 51,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 5,
                         "start_line": 46
                     }
                 },
-                "87": {
+                "78": {
                     "accessible_scopes": [
                         "starkware.starknet.common.syscalls",
                         "starkware.starknet.common.syscalls.call_contract"
@@ -2543,13 +2326,13 @@
                         "end_col": 28,
                         "end_line": 51,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 5,
                         "start_line": 46
                     }
                 },
-                "88": {
+                "79": {
                     "accessible_scopes": [
                         "starkware.starknet.common.syscalls",
                         "starkware.starknet.common.syscalls.call_contract"
@@ -2560,13 +2343,13 @@
                         "end_col": 28,
                         "end_line": 51,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 5,
                         "start_line": 46
                     }
                 },
-                "89": {
+                "80": {
                     "accessible_scopes": [
                         "starkware.starknet.common.syscalls",
                         "starkware.starknet.common.syscalls.call_contract"
@@ -2577,13 +2360,13 @@
                         "end_col": 28,
                         "end_line": 51,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 5,
                         "start_line": 46
                     }
                 },
-                "90": {
+                "81": {
                     "accessible_scopes": [
                         "starkware.starknet.common.syscalls",
                         "starkware.starknet.common.syscalls.call_contract"
@@ -2595,7 +2378,7 @@
                                 "end_col": 88,
                                 "end_line": 52,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                                 },
                                 "start_col": 5,
                                 "start_line": 52
@@ -2607,21 +2390,21 @@
                         "end_col": 54,
                         "end_line": 55,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 38,
                                 "end_line": 42,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 75,
                                         "end_line": 56,
                                         "input_file": {
-                                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                                         },
                                         "start_col": 5,
                                         "start_line": 56
@@ -2637,7 +2420,7 @@
                         "start_line": 55
                     }
                 },
-                "92": {
+                "83": {
                     "accessible_scopes": [
                         "starkware.starknet.common.syscalls",
                         "starkware.starknet.common.syscalls.call_contract"
@@ -2648,13 +2431,13 @@
                         "end_col": 47,
                         "end_line": 56,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 26,
                         "start_line": 56
                     }
                 },
-                "93": {
+                "84": {
                     "accessible_scopes": [
                         "starkware.starknet.common.syscalls",
                         "starkware.starknet.common.syscalls.call_contract"
@@ -2665,13 +2448,13 @@
                         "end_col": 73,
                         "end_line": 56,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 57,
                         "start_line": 56
                     }
                 },
-                "94": {
+                "85": {
                     "accessible_scopes": [
                         "starkware.starknet.common.syscalls",
                         "starkware.starknet.common.syscalls.call_contract"
@@ -2682,13 +2465,13 @@
                         "end_col": 75,
                         "end_line": 56,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 5,
                         "start_line": 56
                     }
                 },
-                "95": {
+                "86": {
                     "accessible_scopes": [
                         "starkware.starknet.common.syscalls",
                         "starkware.starknet.common.syscalls.get_caller_address"
@@ -2699,13 +2482,13 @@
                         "end_col": 90,
                         "end_line": 198,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 63,
                         "start_line": 198
                     }
                 },
-                "97": {
+                "88": {
                     "accessible_scopes": [
                         "starkware.starknet.common.syscalls",
                         "starkware.starknet.common.syscalls.get_caller_address"
@@ -2716,13 +2499,13 @@
                         "end_col": 92,
                         "end_line": 198,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 5,
                         "start_line": 198
                     }
                 },
-                "98": {
+                "89": {
                     "accessible_scopes": [
                         "starkware.starknet.common.syscalls",
                         "starkware.starknet.common.syscalls.get_caller_address"
@@ -2734,7 +2517,7 @@
                                 "end_col": 93,
                                 "end_line": 199,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                                 },
                                 "start_col": 5,
                                 "start_line": 199
@@ -2746,21 +2529,21 @@
                         "end_col": 58,
                         "end_line": 200,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 43,
                                 "end_line": 196,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 61,
                                         "end_line": 201,
                                         "input_file": {
-                                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                                         },
                                         "start_col": 5,
                                         "start_line": 201
@@ -2776,7 +2559,7 @@
                         "start_line": 200
                     }
                 },
-                "100": {
+                "91": {
                     "accessible_scopes": [
                         "starkware.starknet.common.syscalls",
                         "starkware.starknet.common.syscalls.get_caller_address"
@@ -2787,13 +2570,13 @@
                         "end_col": 59,
                         "end_line": 201,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 28,
                         "start_line": 201
                     }
                 },
-                "101": {
+                "92": {
                     "accessible_scopes": [
                         "starkware.starknet.common.syscalls",
                         "starkware.starknet.common.syscalls.get_caller_address"
@@ -2804,13 +2587,13 @@
                         "end_col": 61,
                         "end_line": 201,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 5,
                         "start_line": 201
                     }
                 },
-                "102": {
+                "93": {
                     "accessible_scopes": [
                         "starkware.starknet.common.syscalls",
                         "starkware.starknet.common.syscalls.get_contract_address"
@@ -2821,13 +2604,13 @@
                         "end_col": 94,
                         "end_line": 272,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 65,
                         "start_line": 272
                     }
                 },
-                "104": {
+                "95": {
                     "accessible_scopes": [
                         "starkware.starknet.common.syscalls",
                         "starkware.starknet.common.syscalls.get_contract_address"
@@ -2838,13 +2621,13 @@
                         "end_col": 96,
                         "end_line": 272,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 5,
                         "start_line": 272
                     }
                 },
-                "105": {
+                "96": {
                     "accessible_scopes": [
                         "starkware.starknet.common.syscalls",
                         "starkware.starknet.common.syscalls.get_contract_address"
@@ -2856,7 +2639,7 @@
                                 "end_col": 95,
                                 "end_line": 273,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                                 },
                                 "start_col": 5,
                                 "start_line": 273
@@ -2868,21 +2651,21 @@
                         "end_col": 60,
                         "end_line": 274,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 45,
                                 "end_line": 270,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 65,
                                         "end_line": 275,
                                         "input_file": {
-                                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                                         },
                                         "start_col": 5,
                                         "start_line": 275
@@ -2898,7 +2681,7 @@
                         "start_line": 274
                     }
                 },
-                "107": {
+                "98": {
                     "accessible_scopes": [
                         "starkware.starknet.common.syscalls",
                         "starkware.starknet.common.syscalls.get_contract_address"
@@ -2909,13 +2692,13 @@
                         "end_col": 63,
                         "end_line": 275,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 30,
                         "start_line": 275
                     }
                 },
-                "108": {
+                "99": {
                     "accessible_scopes": [
                         "starkware.starknet.common.syscalls",
                         "starkware.starknet.common.syscalls.get_contract_address"
@@ -2926,13 +2709,13 @@
                         "end_col": 65,
                         "end_line": 275,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 5,
                         "start_line": 275
                     }
                 },
-                "109": {
+                "100": {
                     "accessible_scopes": [
                         "starkware.starknet.common.syscalls",
                         "starkware.starknet.common.syscalls.storage_read"
@@ -2943,13 +2726,13 @@
                         "end_col": 79,
                         "end_line": 350,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 58,
                         "start_line": 350
                     }
                 },
-                "111": {
+                "102": {
                     "accessible_scopes": [
                         "starkware.starknet.common.syscalls",
                         "starkware.starknet.common.syscalls.storage_read"
@@ -2960,13 +2743,13 @@
                         "end_col": 98,
                         "end_line": 350,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 5,
                         "start_line": 350
                     }
                 },
-                "112": {
+                "103": {
                     "accessible_scopes": [
                         "starkware.starknet.common.syscalls",
                         "starkware.starknet.common.syscalls.storage_read"
@@ -2977,13 +2760,13 @@
                         "end_col": 98,
                         "end_line": 350,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 5,
                         "start_line": 350
                     }
                 },
-                "113": {
+                "104": {
                     "accessible_scopes": [
                         "starkware.starknet.common.syscalls",
                         "starkware.starknet.common.syscalls.storage_read"
@@ -2995,7 +2778,7 @@
                                 "end_col": 87,
                                 "end_line": 351,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                                 },
                                 "start_col": 5,
                                 "start_line": 351
@@ -3007,21 +2790,21 @@
                         "end_col": 53,
                         "end_line": 353,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 37,
                                 "end_line": 348,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 35,
                                         "end_line": 354,
                                         "input_file": {
-                                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                                         },
                                         "start_col": 5,
                                         "start_line": 354
@@ -3037,7 +2820,7 @@
                         "start_line": 353
                     }
                 },
-                "115": {
+                "106": {
                     "accessible_scopes": [
                         "starkware.starknet.common.syscalls",
                         "starkware.starknet.common.syscalls.storage_read"
@@ -3048,13 +2831,13 @@
                         "end_col": 33,
                         "end_line": 354,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 19,
                         "start_line": 354
                     }
                 },
-                "116": {
+                "107": {
                     "accessible_scopes": [
                         "starkware.starknet.common.syscalls",
                         "starkware.starknet.common.syscalls.storage_read"
@@ -3065,13 +2848,13 @@
                         "end_col": 35,
                         "end_line": 354,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 5,
                         "start_line": 354
                     }
                 },
-                "117": {
+                "108": {
                     "accessible_scopes": [
                         "starkware.starknet.common.syscalls",
                         "starkware.starknet.common.syscalls.storage_write"
@@ -3082,13 +2865,13 @@
                         "end_col": 40,
                         "end_line": 368,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 18,
                         "start_line": 368
                     }
                 },
-                "119": {
+                "110": {
                     "accessible_scopes": [
                         "starkware.starknet.common.syscalls",
                         "starkware.starknet.common.syscalls.storage_write"
@@ -3099,13 +2882,13 @@
                         "end_col": 72,
                         "end_line": 368,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 5,
                         "start_line": 367
                     }
                 },
-                "120": {
+                "111": {
                     "accessible_scopes": [
                         "starkware.starknet.common.syscalls",
                         "starkware.starknet.common.syscalls.storage_write"
@@ -3116,13 +2899,13 @@
                         "end_col": 72,
                         "end_line": 368,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 5,
                         "start_line": 367
                     }
                 },
-                "121": {
+                "112": {
                     "accessible_scopes": [
                         "starkware.starknet.common.syscalls",
                         "starkware.starknet.common.syscalls.storage_write"
@@ -3133,13 +2916,13 @@
                         "end_col": 72,
                         "end_line": 368,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 5,
                         "start_line": 367
                     }
                 },
-                "122": {
+                "113": {
                     "accessible_scopes": [
                         "starkware.starknet.common.syscalls",
                         "starkware.starknet.common.syscalls.storage_write"
@@ -3151,7 +2934,7 @@
                                 "end_col": 88,
                                 "end_line": 369,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                                 },
                                 "start_col": 5,
                                 "start_line": 369
@@ -3163,21 +2946,21 @@
                         "end_col": 54,
                         "end_line": 370,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 38,
                                 "end_line": 366,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 15,
                                         "end_line": 371,
                                         "input_file": {
-                                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                                         },
                                         "start_col": 5,
                                         "start_line": 371
@@ -3193,7 +2976,7 @@
                         "start_line": 370
                     }
                 },
-                "124": {
+                "115": {
                     "accessible_scopes": [
                         "starkware.starknet.common.syscalls",
                         "starkware.starknet.common.syscalls.storage_write"
@@ -3204,13 +2987,13 @@
                         "end_col": 15,
                         "end_line": 371,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 5,
                         "start_line": 371
                     }
                 },
-                "125": {
+                "116": {
                     "accessible_scopes": [
                         "starkware.starknet.common.syscalls",
                         "starkware.starknet.common.syscalls.get_tx_info"
@@ -3221,13 +3004,13 @@
                         "end_col": 76,
                         "end_line": 440,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 56,
                         "start_line": 440
                     }
                 },
-                "127": {
+                "118": {
                     "accessible_scopes": [
                         "starkware.starknet.common.syscalls",
                         "starkware.starknet.common.syscalls.get_tx_info"
@@ -3238,13 +3021,13 @@
                         "end_col": 78,
                         "end_line": 440,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 5,
                         "start_line": 440
                     }
                 },
-                "128": {
+                "119": {
                     "accessible_scopes": [
                         "starkware.starknet.common.syscalls",
                         "starkware.starknet.common.syscalls.get_tx_info"
@@ -3256,7 +3039,7 @@
                                 "end_col": 86,
                                 "end_line": 441,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                                 },
                                 "start_col": 5,
                                 "start_line": 441
@@ -3268,21 +3051,21 @@
                         "end_col": 51,
                         "end_line": 443,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 36,
                                 "end_line": 438,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 39,
                                         "end_line": 444,
                                         "input_file": {
-                                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                                         },
                                         "start_col": 5,
                                         "start_line": 444
@@ -3298,7 +3081,7 @@
                         "start_line": 443
                     }
                 },
-                "130": {
+                "121": {
                     "accessible_scopes": [
                         "starkware.starknet.common.syscalls",
                         "starkware.starknet.common.syscalls.get_tx_info"
@@ -3309,13 +3092,13 @@
                         "end_col": 37,
                         "end_line": 444,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 21,
                         "start_line": 444
                     }
                 },
-                "131": {
+                "122": {
                     "accessible_scopes": [
                         "starkware.starknet.common.syscalls",
                         "starkware.starknet.common.syscalls.get_tx_info"
@@ -3326,13 +3109,13 @@
                         "end_col": 39,
                         "end_line": 444,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 5,
                         "start_line": 444
                     }
                 },
-                "132": {
+                "123": {
                     "accessible_scopes": [
                         "starkware.cairo.common.signature",
                         "starkware.cairo.common.signature.verify_ecdsa_signature"
@@ -3344,7 +3127,7 @@
                                 "end_col": 98,
                                 "end_line": 13,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/signature.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/signature.cairo"
                                 },
                                 "start_col": 5,
                                 "start_line": 13
@@ -3356,13 +3139,13 @@
                         "end_col": 40,
                         "end_line": 14,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/signature.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/signature.cairo"
                         },
                         "start_col": 5,
                         "start_line": 14
                     }
                 },
-                "133": {
+                "124": {
                     "accessible_scopes": [
                         "starkware.cairo.common.signature",
                         "starkware.cairo.common.signature.verify_ecdsa_signature"
@@ -3373,13 +3156,13 @@
                         "end_col": 43,
                         "end_line": 15,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/signature.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/signature.cairo"
                         },
                         "start_col": 5,
                         "start_line": 15
                     }
                 },
-                "134": {
+                "125": {
                     "accessible_scopes": [
                         "starkware.cairo.common.signature",
                         "starkware.cairo.common.signature.verify_ecdsa_signature"
@@ -3390,21 +3173,21 @@
                         "end_col": 54,
                         "end_line": 17,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/signature.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/signature.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 57,
                                 "end_line": 10,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/signature.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/signature.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 15,
                                         "end_line": 18,
                                         "input_file": {
-                                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/signature.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/signature.cairo"
                                         },
                                         "start_col": 5,
                                         "start_line": 18
@@ -3420,7 +3203,7 @@
                         "start_line": 17
                     }
                 },
-                "136": {
+                "127": {
                     "accessible_scopes": [
                         "starkware.cairo.common.signature",
                         "starkware.cairo.common.signature.verify_ecdsa_signature"
@@ -3431,372 +3214,521 @@
                         "end_col": 15,
                         "end_line": 18,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/signature.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/signature.cairo"
                         },
                         "start_col": 5,
                         "start_line": 18
                     }
                 },
-                "137": {
+                "128": {
+                    "accessible_scopes": [
+                        "starkware.cairo.common.math_cmp",
+                        "starkware.cairo.common.math_cmp.is_le_felt"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [
+                        {
+                            "location": {
+                                "end_col": 70,
+                                "end_line": 80,
+                                "input_file": {
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
+                                },
+                                "start_col": 5,
+                                "start_line": 80
+                            },
+                            "n_prefix_newlines": 0
+                        }
+                    ],
+                    "inst": {
+                        "end_col": 34,
+                        "end_line": 81,
+                        "input_file": {
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
+                        },
+                        "start_col": 5,
+                        "start_line": 81
+                    }
+                },
+                "130": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.addr"
+                        "starkware.cairo.common.math_cmp",
+                        "starkware.cairo.common.math_cmp.is_le_felt"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 41,
-                        "end_line": 7,
+                        "end_col": 12,
+                        "end_line": 82,
+                        "input_file": {
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
+                        },
+                        "start_col": 5,
+                        "start_line": 82
+                    }
+                },
+                "132": {
+                    "accessible_scopes": [
+                        "starkware.cairo.common.math_cmp",
+                        "starkware.cairo.common.math_cmp.is_le_felt"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 32,
+                        "end_line": 79,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 48,
-                                "end_line": 9,
+                                "end_col": 36,
+                                "end_line": 154,
                                 "input_file": {
-                                    "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
                                 },
-                                "start_col": 36,
-                                "start_line": 9
+                                "parent_location": [
+                                    {
+                                        "end_col": 25,
+                                        "end_line": 83,
+                                        "input_file": {
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
+                                        },
+                                        "start_col": 5,
+                                        "start_line": 83
+                                    },
+                                    "While trying to retrieve the implicit argument 'range_check_ptr' in:"
+                                ],
+                                "start_col": 21,
+                                "start_line": 154
                             },
-                            "While expanding the reference 'pedersen_ptr' in:"
+                            "While expanding the reference 'range_check_ptr' in:"
                         ],
-                        "start_col": 15,
-                        "start_line": 7
+                        "start_col": 17,
+                        "start_line": 79
                     }
                 },
-                "138": {
+                "133": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.addr"
+                        "starkware.cairo.common.math_cmp",
+                        "starkware.cairo.common.math_cmp.is_le_felt"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 94,
-                        "end_line": 8,
+                        "end_col": 35,
+                        "end_line": 79,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 53,
-                                "end_line": 9,
+                                "end_col": 21,
+                                "end_line": 83,
                                 "input_file": {
-                                    "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
                                 },
-                                "start_col": 50,
-                                "start_line": 9
+                                "start_col": 20,
+                                "start_line": 83
                             },
-                            "While expanding the reference 'res' in:"
+                            "While expanding the reference 'a' in:"
                         ],
-                        "start_col": 19,
-                        "start_line": 8
+                        "start_col": 34,
+                        "start_line": 79
                     }
                 },
-                "140": {
+                "134": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.addr"
+                        "starkware.cairo.common.math_cmp",
+                        "starkware.cairo.common.math_cmp.is_le_felt"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 84,
-                        "end_line": 9,
+                        "end_col": 38,
+                        "end_line": 79,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
                         },
-                        "start_col": 55,
-                        "start_line": 9
+                        "parent_location": [
+                            {
+                                "end_col": 24,
+                                "end_line": 83,
+                                "input_file": {
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
+                                },
+                                "start_col": 23,
+                                "start_line": 83
+                            },
+                            "While expanding the reference 'b' in:"
+                        ],
+                        "start_col": 37,
+                        "start_line": 79
                     }
                 },
-                "141": {
+                "135": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.addr"
+                        "starkware.cairo.common.math_cmp",
+                        "starkware.cairo.common.math_cmp.is_le_felt"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 85,
-                        "end_line": 9,
+                        "end_col": 25,
+                        "end_line": 83,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
                         },
-                        "start_col": 21,
-                        "start_line": 9
+                        "start_col": 5,
+                        "start_line": 83
                     }
                 },
-                "143": {
+                "137": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.addr"
+                        "starkware.cairo.common.math_cmp",
+                        "starkware.cairo.common.math_cmp.is_le_felt"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 58,
-                        "end_line": 7,
+                        "end_col": 13,
+                        "end_line": 84,
+                        "input_file": {
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
+                        },
+                        "start_col": 12,
+                        "start_line": 84
+                    }
+                },
+                "139": {
+                    "accessible_scopes": [
+                        "starkware.cairo.common.math_cmp",
+                        "starkware.cairo.common.math_cmp.is_le_felt"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 14,
+                        "end_line": 84,
+                        "input_file": {
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
+                        },
+                        "start_col": 5,
+                        "start_line": 84
+                    }
+                },
+                "140": {
+                    "accessible_scopes": [
+                        "starkware.cairo.common.math_cmp",
+                        "starkware.cairo.common.math_cmp.is_le_felt"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 32,
+                        "end_line": 79,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 39,
-                                "end_line": 12,
+                                "end_col": 36,
+                                "end_line": 223,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/storage.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 48,
-                                        "end_line": 10,
+                                        "end_col": 25,
+                                        "end_line": 87,
                                         "input_file": {
-                                            "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
                                         },
-                                        "start_col": 21,
-                                        "start_line": 10
+                                        "start_col": 5,
+                                        "start_line": 87
                                     },
                                     "While trying to retrieve the implicit argument 'range_check_ptr' in:"
                                 ],
-                                "start_col": 24,
-                                "start_line": 12
+                                "start_col": 21,
+                                "start_line": 223
                             },
                             "While expanding the reference 'range_check_ptr' in:"
                         ],
-                        "start_col": 43,
-                        "start_line": 7
+                        "start_col": 17,
+                        "start_line": 79
                     }
                 },
-                "144": {
+                "141": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.addr"
+                        "starkware.cairo.common.math_cmp",
+                        "starkware.cairo.common.math_cmp.is_le_felt"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 17,
-                        "end_line": 9,
+                        "end_col": 38,
+                        "end_line": 79,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 47,
-                                "end_line": 10,
+                                "end_col": 21,
+                                "end_line": 87,
                                 "input_file": {
-                                    "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
                                 },
-                                "start_col": 44,
-                                "start_line": 10
+                                "start_col": 20,
+                                "start_line": 87
                             },
-                            "While expanding the reference 'res' in:"
+                            "While expanding the reference 'b' in:"
                         ],
-                        "start_col": 14,
-                        "start_line": 9
+                        "start_col": 37,
+                        "start_line": 79
                     }
                 },
-                "145": {
+                "142": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.addr"
+                        "starkware.cairo.common.math_cmp",
+                        "starkware.cairo.common.math_cmp.is_le_felt"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 48,
-                        "end_line": 10,
+                        "end_col": 35,
+                        "end_line": 79,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
                         },
-                        "start_col": 21,
-                        "start_line": 10
+                        "parent_location": [
+                            {
+                                "end_col": 24,
+                                "end_line": 87,
+                                "input_file": {
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
+                                },
+                                "start_col": 23,
+                                "start_line": 87
+                            },
+                            "While expanding the reference 'a' in:"
+                        ],
+                        "start_col": 34,
+                        "start_line": 79
                     }
                 },
-                "147": {
+                "143": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.addr"
+                        "starkware.cairo.common.math_cmp",
+                        "starkware.cairo.common.math_cmp.is_le_felt"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 48,
-                        "end_line": 9,
+                        "end_col": 25,
+                        "end_line": 87,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
                         },
-                        "parent_location": [
-                            {
-                                "end_col": 41,
-                                "end_line": 7,
-                                "input_file": {
-                                    "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/decl.cairo"
-                                },
-                                "parent_location": [
-                                    {
-                                        "end_col": 26,
-                                        "end_line": 11,
-                                        "input_file": {
-                                            "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
-                                        },
-                                        "start_col": 9,
-                                        "start_line": 11
-                                    },
-                                    "While trying to retrieve the implicit argument 'pedersen_ptr' in:"
+                        "start_col": 5,
+                        "start_line": 87
+                    }
+                },
+                "145": {
+                    "accessible_scopes": [
+                        "starkware.cairo.common.math_cmp",
+                        "starkware.cairo.common.math_cmp.is_le_felt"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 13,
+                        "end_line": 88,
+                        "input_file": {
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
+                        },
+                        "start_col": 12,
+                        "start_line": 88
+                    }
+                },
+                "147": {
+                    "accessible_scopes": [
+                        "starkware.cairo.common.math_cmp",
+                        "starkware.cairo.common.math_cmp.is_le_felt"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 14,
+                        "end_line": 88,
+                        "input_file": {
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
+                        },
+                        "start_col": 5,
+                        "start_line": 88
+                    }
+                },
+                "148": {
+                    "accessible_scopes": [
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account_public_key",
+                        "openzeppelin.account.library.Account_public_key.addr"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 41,
+                        "end_line": 7,
+                        "input_file": {
+                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
+                        },
+                        "parent_location": [
+                            {
+                                "end_col": 41,
+                                "end_line": 7,
+                                "input_file": {
+                                    "filename": "autogen/starknet/storage_var/Account_public_key/decl.cairo"
+                                },
+                                "parent_location": [
+                                    {
+                                        "end_col": 26,
+                                        "end_line": 9,
+                                        "input_file": {
+                                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
+                                        },
+                                        "start_col": 9,
+                                        "start_line": 9
+                                    },
+                                    "While trying to retrieve the implicit argument 'pedersen_ptr' in:"
                                 ],
                                 "start_col": 15,
                                 "start_line": 7
                             },
                             "While expanding the reference 'pedersen_ptr' in:"
                         ],
-                        "start_col": 36,
-                        "start_line": 9
+                        "start_col": 15,
+                        "start_line": 7
                     }
                 },
-                "148": {
+                "149": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.addr"
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account_public_key",
+                        "openzeppelin.account.library.Account_public_key.addr"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 39,
-                        "end_line": 12,
+                        "end_col": 58,
+                        "end_line": 7,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/storage.cairo"
+                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 48,
-                                "end_line": 10,
+                                "end_col": 58,
+                                "end_line": 7,
                                 "input_file": {
-                                    "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
+                                    "filename": "autogen/starknet/storage_var/Account_public_key/decl.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 58,
-                                        "end_line": 7,
+                                        "end_col": 26,
+                                        "end_line": 9,
                                         "input_file": {
-                                            "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/decl.cairo"
+                                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
                                         },
-                                        "parent_location": [
-                                            {
-                                                "end_col": 26,
-                                                "end_line": 11,
-                                                "input_file": {
-                                                    "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
-                                                },
-                                                "start_col": 9,
-                                                "start_line": 11
-                                            },
-                                            "While trying to retrieve the implicit argument 'range_check_ptr' in:"
-                                        ],
-                                        "start_col": 43,
-                                        "start_line": 7
+                                        "start_col": 9,
+                                        "start_line": 9
                                     },
-                                    "While expanding the reference 'range_check_ptr' in:"
+                                    "While trying to retrieve the implicit argument 'range_check_ptr' in:"
                                 ],
-                                "start_col": 21,
-                                "start_line": 10
+                                "start_col": 43,
+                                "start_line": 7
                             },
-                            "While trying to update the implicit return value 'range_check_ptr' in:"
+                            "While expanding the reference 'range_check_ptr' in:"
                         ],
-                        "start_col": 24,
-                        "start_line": 12
+                        "start_col": 43,
+                        "start_line": 7
                     }
                 },
-                "149": {
+                "150": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.addr"
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account_public_key",
+                        "openzeppelin.account.library.Account_public_key.addr"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 17,
-                        "end_line": 10,
+                        "end_col": 94,
+                        "end_line": 8,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
+                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 24,
-                                "end_line": 11,
+                                "end_line": 9,
                                 "input_file": {
-                                    "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
+                                    "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
                                 },
                                 "start_col": 21,
-                                "start_line": 11
+                                "start_line": 9
                             },
                             "While expanding the reference 'res' in:"
                         ],
-                        "start_col": 14,
-                        "start_line": 10
+                        "start_col": 19,
+                        "start_line": 8
                     }
                 },
-                "150": {
+                "152": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.addr"
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account_public_key",
+                        "openzeppelin.account.library.Account_public_key.addr"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
                         "end_col": 26,
-                        "end_line": 11,
+                        "end_line": 9,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
+                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
                         },
                         "start_col": 9,
-                        "start_line": 11
+                        "start_line": 9
                     }
                 },
-                "151": {
+                "153": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.read"
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account_public_key",
+                        "openzeppelin.account.library.Account_public_key.read"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
                         "end_col": 61,
-                        "end_line": 14,
+                        "end_line": 12,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
+                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 41,
                                 "end_line": 7,
                                 "input_file": {
-                                    "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/decl.cairo"
+                                    "filename": "autogen/starknet/storage_var/Account_public_key/decl.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 48,
-                                        "end_line": 17,
+                                        "end_col": 36,
+                                        "end_line": 15,
                                         "input_file": {
-                                            "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
+                                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
                                         },
                                         "start_col": 30,
-                                        "start_line": 17
+                                        "start_line": 15
                                     },
                                     "While trying to retrieve the implicit argument 'pedersen_ptr' in:"
                                 ],
@@ -3806,39 +3738,39 @@
                             "While expanding the reference 'pedersen_ptr' in:"
                         ],
                         "start_col": 35,
-                        "start_line": 14
+                        "start_line": 12
                     }
                 },
-                "152": {
+                "154": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.read"
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account_public_key",
+                        "openzeppelin.account.library.Account_public_key.read"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
                         "end_col": 78,
-                        "end_line": 14,
+                        "end_line": 12,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
+                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 58,
                                 "end_line": 7,
                                 "input_file": {
-                                    "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/decl.cairo"
+                                    "filename": "autogen/starknet/storage_var/Account_public_key/decl.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 48,
-                                        "end_line": 17,
+                                        "end_col": 36,
+                                        "end_line": 15,
                                         "input_file": {
-                                            "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
+                                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
                                         },
                                         "start_col": 30,
-                                        "start_line": 17
+                                        "start_line": 15
                                     },
                                     "While trying to retrieve the implicit argument 'range_check_ptr' in:"
                                 ],
@@ -3848,87 +3780,57 @@
                             "While expanding the reference 'range_check_ptr' in:"
                         ],
                         "start_col": 63,
-                        "start_line": 14
+                        "start_line": 12
                     }
                 },
-                "153": {
+                "155": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.read"
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account_public_key",
+                        "openzeppelin.account.library.Account_public_key.read"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 27,
+                        "end_col": 36,
                         "end_line": 15,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
-                        },
-                        "parent_location": [
-                            {
-                                "end_col": 47,
-                                "end_line": 17,
-                                "input_file": {
-                                    "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
-                                },
-                                "start_col": 35,
-                                "start_line": 17
-                            },
-                            "While expanding the reference 'interface_id' in:"
-                        ],
-                        "start_col": 9,
-                        "start_line": 15
-                    }
-                },
-                "154": {
-                    "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.read"
-                    ],
-                    "flow_tracking_data": null,
-                    "hints": [],
-                    "inst": {
-                        "end_col": 48,
-                        "end_line": 17,
-                        "input_file": {
-                            "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
+                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
                         },
                         "start_col": 30,
-                        "start_line": 17
+                        "start_line": 15
                     }
                 },
-                "156": {
+                "157": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.read"
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account_public_key",
+                        "openzeppelin.account.library.Account_public_key.read"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
                         "end_col": 33,
-                        "end_line": 14,
+                        "end_line": 12,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
+                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 37,
                                 "end_line": 348,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 75,
-                                        "end_line": 18,
+                                        "end_line": 16,
                                         "input_file": {
-                                            "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
+                                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
                                         },
                                         "start_col": 37,
-                                        "start_line": 18
+                                        "start_line": 16
                                     },
                                     "While trying to retrieve the implicit argument 'syscall_ptr' in:"
                                 ],
@@ -3938,62 +3840,62 @@
                             "While expanding the reference 'syscall_ptr' in:"
                         ],
                         "start_col": 15,
-                        "start_line": 14
+                        "start_line": 12
                     }
                 },
-                "157": {
+                "158": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.read"
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account_public_key",
+                        "openzeppelin.account.library.Account_public_key.read"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
                         "end_col": 26,
-                        "end_line": 17,
+                        "end_line": 15,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
+                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 70,
-                                "end_line": 18,
+                                "end_line": 16,
                                 "input_file": {
-                                    "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
+                                    "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
                                 },
                                 "start_col": 58,
-                                "start_line": 18
+                                "start_line": 16
                             },
                             "While expanding the reference 'storage_addr' in:"
                         ],
                         "start_col": 14,
-                        "start_line": 17
+                        "start_line": 15
                     }
                 },
-                "158": {
+                "159": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.read"
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account_public_key",
+                        "openzeppelin.account.library.Account_public_key.read"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
                         "end_col": 75,
-                        "end_line": 18,
+                        "end_line": 16,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
+                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
                         },
                         "start_col": 37,
-                        "start_line": 18
+                        "start_line": 16
                     }
                 },
-                "160": {
+                "161": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.read"
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account_public_key",
+                        "openzeppelin.account.library.Account_public_key.read"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
@@ -4001,29 +3903,29 @@
                         "end_col": 37,
                         "end_line": 348,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 75,
-                                "end_line": 18,
+                                "end_line": 16,
                                 "input_file": {
-                                    "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
+                                    "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 42,
-                                        "end_line": 20,
+                                        "end_line": 18,
                                         "input_file": {
-                                            "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
+                                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
                                         },
                                         "start_col": 31,
-                                        "start_line": 20
+                                        "start_line": 18
                                     },
                                     "While expanding the reference 'syscall_ptr' in:"
                                 ],
                                 "start_col": 37,
-                                "start_line": 18
+                                "start_line": 16
                             },
                             "While trying to update the implicit return value 'syscall_ptr' in:"
                         ],
@@ -4031,11 +3933,11 @@
                         "start_line": 348
                     }
                 },
-                "161": {
+                "162": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.read"
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account_public_key",
+                        "openzeppelin.account.library.Account_public_key.read"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
@@ -4043,29 +3945,29 @@
                         "end_col": 41,
                         "end_line": 7,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/decl.cairo"
+                            "filename": "autogen/starknet/storage_var/Account_public_key/decl.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 48,
-                                "end_line": 17,
+                                "end_col": 36,
+                                "end_line": 15,
                                 "input_file": {
-                                    "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
+                                    "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 44,
-                                        "end_line": 21,
+                                        "end_line": 19,
                                         "input_file": {
-                                            "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
+                                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
                                         },
                                         "start_col": 32,
-                                        "start_line": 21
+                                        "start_line": 19
                                     },
                                     "While expanding the reference 'pedersen_ptr' in:"
                                 ],
                                 "start_col": 30,
-                                "start_line": 17
+                                "start_line": 15
                             },
                             "While trying to update the implicit return value 'pedersen_ptr' in:"
                         ],
@@ -4073,11 +3975,11 @@
                         "start_line": 7
                     }
                 },
-                "162": {
+                "163": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.read"
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account_public_key",
+                        "openzeppelin.account.library.Account_public_key.read"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
@@ -4085,29 +3987,29 @@
                         "end_col": 58,
                         "end_line": 7,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/decl.cairo"
+                            "filename": "autogen/starknet/storage_var/Account_public_key/decl.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 48,
-                                "end_line": 17,
+                                "end_col": 36,
+                                "end_line": 15,
                                 "input_file": {
-                                    "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
+                                    "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 50,
-                                        "end_line": 22,
+                                        "end_line": 20,
                                         "input_file": {
-                                            "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
+                                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
                                         },
                                         "start_col": 35,
-                                        "start_line": 22
+                                        "start_line": 20
                                     },
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
                                 "start_col": 30,
-                                "start_line": 17
+                                "start_line": 15
                             },
                             "While trying to update the implicit return value 'range_check_ptr' in:"
                         ],
@@ -4115,84 +4017,84 @@
                         "start_line": 7
                     }
                 },
-                "163": {
+                "164": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.read"
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account_public_key",
+                        "openzeppelin.account.library.Account_public_key.read"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
                         "end_col": 33,
-                        "end_line": 18,
+                        "end_line": 16,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
+                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 64,
-                                "end_line": 23,
+                                "end_line": 21,
                                 "input_file": {
-                                    "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
+                                    "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
                                 },
                                 "start_col": 45,
-                                "start_line": 23
+                                "start_line": 21
                             },
                             "While expanding the reference '__storage_var_temp0' in:"
                         ],
                         "start_col": 14,
-                        "start_line": 18
+                        "start_line": 16
                     }
                 },
-                "164": {
+                "165": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.read"
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account_public_key",
+                        "openzeppelin.account.library.Account_public_key.read"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
                         "end_col": 55,
-                        "end_line": 24,
+                        "end_line": 22,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
+                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
                         },
                         "start_col": 9,
-                        "start_line": 24
+                        "start_line": 22
                     }
                 },
-                "165": {
+                "166": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.write"
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account_public_key",
+                        "openzeppelin.account.library.Account_public_key.write"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
                         "end_col": 62,
-                        "end_line": 27,
+                        "end_line": 25,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
+                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 41,
                                 "end_line": 7,
                                 "input_file": {
-                                    "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/decl.cairo"
+                                    "filename": "autogen/starknet/storage_var/Account_public_key/decl.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 48,
-                                        "end_line": 30,
+                                        "end_col": 36,
+                                        "end_line": 26,
                                         "input_file": {
-                                            "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
+                                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
                                         },
                                         "start_col": 30,
-                                        "start_line": 30
+                                        "start_line": 26
                                     },
                                     "While trying to retrieve the implicit argument 'pedersen_ptr' in:"
                                 ],
@@ -4202,39 +4104,39 @@
                             "While expanding the reference 'pedersen_ptr' in:"
                         ],
                         "start_col": 36,
-                        "start_line": 27
+                        "start_line": 25
                     }
                 },
-                "166": {
+                "167": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.write"
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account_public_key",
+                        "openzeppelin.account.library.Account_public_key.write"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
                         "end_col": 79,
-                        "end_line": 27,
+                        "end_line": 25,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
+                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 58,
                                 "end_line": 7,
                                 "input_file": {
-                                    "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/decl.cairo"
+                                    "filename": "autogen/starknet/storage_var/Account_public_key/decl.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 48,
-                                        "end_line": 30,
+                                        "end_col": 36,
+                                        "end_line": 26,
                                         "input_file": {
-                                            "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
+                                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
                                         },
                                         "start_col": 30,
-                                        "start_line": 30
+                                        "start_line": 26
                                     },
                                     "While trying to retrieve the implicit argument 'range_check_ptr' in:"
                                 ],
@@ -4244,87 +4146,57 @@
                             "While expanding the reference 'range_check_ptr' in:"
                         ],
                         "start_col": 64,
-                        "start_line": 27
-                    }
-                },
-                "167": {
-                    "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.write"
-                    ],
-                    "flow_tracking_data": null,
-                    "hints": [],
-                    "inst": {
-                        "end_col": 27,
-                        "end_line": 28,
-                        "input_file": {
-                            "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
-                        },
-                        "parent_location": [
-                            {
-                                "end_col": 47,
-                                "end_line": 30,
-                                "input_file": {
-                                    "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
-                                },
-                                "start_col": 35,
-                                "start_line": 30
-                            },
-                            "While expanding the reference 'interface_id' in:"
-                        ],
-                        "start_col": 9,
-                        "start_line": 28
+                        "start_line": 25
                     }
                 },
                 "168": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.write"
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account_public_key",
+                        "openzeppelin.account.library.Account_public_key.write"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 48,
-                        "end_line": 30,
+                        "end_col": 36,
+                        "end_line": 26,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
+                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
                         },
                         "start_col": 30,
-                        "start_line": 30
+                        "start_line": 26
                     }
                 },
                 "170": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.write"
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account_public_key",
+                        "openzeppelin.account.library.Account_public_key.write"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
                         "end_col": 34,
-                        "end_line": 27,
+                        "end_line": 25,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
+                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 38,
                                 "end_line": 366,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 80,
-                                        "end_line": 31,
+                                        "end_line": 27,
                                         "input_file": {
-                                            "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
+                                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
                                         },
                                         "start_col": 9,
-                                        "start_line": 31
+                                        "start_line": 27
                                     },
                                     "While trying to retrieve the implicit argument 'syscall_ptr' in:"
                                 ],
@@ -4334,80 +4206,80 @@
                             "While expanding the reference 'syscall_ptr' in:"
                         ],
                         "start_col": 16,
-                        "start_line": 27
+                        "start_line": 25
                     }
                 },
                 "171": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.write"
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account_public_key",
+                        "openzeppelin.account.library.Account_public_key.write"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
                         "end_col": 26,
-                        "end_line": 30,
+                        "end_line": 26,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
+                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 43,
-                                "end_line": 31,
+                                "end_line": 27,
                                 "input_file": {
-                                    "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
+                                    "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
                                 },
                                 "start_col": 31,
-                                "start_line": 31
+                                "start_line": 27
                             },
                             "While expanding the reference 'storage_addr' in:"
                         ],
                         "start_col": 14,
-                        "start_line": 30
+                        "start_line": 26
                     }
                 },
                 "172": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.write"
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account_public_key",
+                        "openzeppelin.account.library.Account_public_key.write"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
                         "end_col": 79,
-                        "end_line": 31,
+                        "end_line": 27,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
+                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
                         },
                         "start_col": 55,
-                        "start_line": 31
+                        "start_line": 27
                     }
                 },
                 "173": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.write"
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account_public_key",
+                        "openzeppelin.account.library.Account_public_key.write"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
                         "end_col": 80,
-                        "end_line": 31,
+                        "end_line": 27,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
+                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
                         },
                         "start_col": 9,
-                        "start_line": 31
+                        "start_line": 27
                     }
                 },
                 "175": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.write"
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account_public_key",
+                        "openzeppelin.account.library.Account_public_key.write"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
@@ -4415,31 +4287,31 @@
                         "end_col": 41,
                         "end_line": 7,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/decl.cairo"
+                            "filename": "autogen/starknet/storage_var/Account_public_key/decl.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 48,
-                                "end_line": 30,
+                                "end_col": 36,
+                                "end_line": 26,
                                 "input_file": {
-                                    "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
+                                    "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 62,
                                         "end_line": 21,
                                         "input_file": {
-                                            "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/decl.cairo"
+                                            "filename": "autogen/starknet/storage_var/Account_public_key/decl.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 19,
-                                                "end_line": 32,
+                                                "end_line": 28,
                                                 "input_file": {
-                                                    "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
+                                                    "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
                                                 },
                                                 "start_col": 9,
-                                                "start_line": 32
+                                                "start_line": 28
                                             },
                                             "While trying to retrieve the implicit argument 'pedersen_ptr' in:"
                                         ],
@@ -4449,7 +4321,7 @@
                                     "While expanding the reference 'pedersen_ptr' in:"
                                 ],
                                 "start_col": 30,
-                                "start_line": 30
+                                "start_line": 26
                             },
                             "While trying to update the implicit return value 'pedersen_ptr' in:"
                         ],
@@ -4459,9 +4331,9 @@
                 },
                 "176": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.write"
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account_public_key",
+                        "openzeppelin.account.library.Account_public_key.write"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
@@ -4469,31 +4341,31 @@
                         "end_col": 58,
                         "end_line": 7,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/decl.cairo"
+                            "filename": "autogen/starknet/storage_var/Account_public_key/decl.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 48,
-                                "end_line": 30,
+                                "end_col": 36,
+                                "end_line": 26,
                                 "input_file": {
-                                    "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
+                                    "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 79,
                                         "end_line": 21,
                                         "input_file": {
-                                            "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/decl.cairo"
+                                            "filename": "autogen/starknet/storage_var/Account_public_key/decl.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 19,
-                                                "end_line": 32,
+                                                "end_line": 28,
                                                 "input_file": {
-                                                    "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
+                                                    "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
                                                 },
                                                 "start_col": 9,
-                                                "start_line": 32
+                                                "start_line": 28
                                             },
                                             "While trying to retrieve the implicit argument 'range_check_ptr' in:"
                                         ],
@@ -4503,7 +4375,7 @@
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
                                 "start_col": 30,
-                                "start_line": 30
+                                "start_line": 26
                             },
                             "While trying to update the implicit return value 'range_check_ptr' in:"
                         ],
@@ -4513,2921 +4385,2849 @@
                 },
                 "177": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces",
-                        "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.write"
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account_public_key",
+                        "openzeppelin.account.library.Account_public_key.write"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
                         "end_col": 19,
-                        "end_line": 32,
+                        "end_line": 28,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/impl.cairo"
+                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
                         },
                         "start_col": 9,
-                        "start_line": 32
+                        "start_line": 28
                     }
                 },
                 "178": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165",
-                        "openzeppelin.introspection.erc165.library.ERC165.supports_interface"
-                    ],
-                    "flow_tracking_data": null,
-                    "hints": [],
-                    "inst": {
-                        "end_col": 39,
-                        "end_line": 20,
-                        "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/introspection/erc165/library.cairo"
-                        },
-                        "start_col": 13,
-                        "start_line": 20
-                    }
-                },
-                "180": {
-                    "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165",
-                        "openzeppelin.introspection.erc165.library.ERC165.supports_interface"
-                    ],
-                    "flow_tracking_data": null,
-                    "hints": [],
-                    "inst": {
-                        "end_col": 11,
-                        "end_line": 20,
-                        "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/introspection/erc165/library.cairo"
-                        },
-                        "start_col": 9,
-                        "start_line": 20
-                    }
-                },
-                "182": {
-                    "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165",
-                        "openzeppelin.introspection.erc165.library.ERC165.supports_interface"
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account.initializer"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 47,
-                        "end_line": 17,
+                        "end_col": 40,
+                        "end_line": 61,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/introspection/erc165/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 47,
-                                "end_line": 17,
+                                "end_col": 34,
+                                "end_line": 21,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/introspection/erc165/library.cairo"
+                                    "filename": "autogen/starknet/storage_var/Account_public_key/decl.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 35,
-                                        "end_line": 21,
+                                        "end_col": 46,
+                                        "end_line": 64,
                                         "input_file": {
-                                            "filename": "/home/cairo-contracts/src/openzeppelin/introspection/erc165/library.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
-                                        "start_col": 13,
-                                        "start_line": 21
+                                        "start_col": 9,
+                                        "start_line": 64
                                     },
                                     "While trying to retrieve the implicit argument 'syscall_ptr' in:"
                                 ],
-                                "start_col": 29,
-                                "start_line": 17
+                                "start_col": 16,
+                                "start_line": 21
                             },
                             "While expanding the reference 'syscall_ptr' in:"
                         ],
-                        "start_col": 29,
-                        "start_line": 17
+                        "start_col": 22,
+                        "start_line": 61
                     }
                 },
-                "183": {
+                "179": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165",
-                        "openzeppelin.introspection.erc165.library.ERC165.supports_interface"
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account.initializer"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 75,
-                        "end_line": 17,
+                        "end_col": 68,
+                        "end_line": 61,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/introspection/erc165/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 75,
-                                "end_line": 17,
+                                "end_col": 62,
+                                "end_line": 21,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/introspection/erc165/library.cairo"
+                                    "filename": "autogen/starknet/storage_var/Account_public_key/decl.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 35,
-                                        "end_line": 21,
+                                        "end_col": 46,
+                                        "end_line": 64,
                                         "input_file": {
-                                            "filename": "/home/cairo-contracts/src/openzeppelin/introspection/erc165/library.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
-                                        "start_col": 13,
-                                        "start_line": 21
+                                        "start_col": 9,
+                                        "start_line": 64
                                     },
                                     "While trying to retrieve the implicit argument 'pedersen_ptr' in:"
                                 ],
-                                "start_col": 49,
-                                "start_line": 17
+                                "start_col": 36,
+                                "start_line": 21
                             },
                             "While expanding the reference 'pedersen_ptr' in:"
                         ],
-                        "start_col": 49,
-                        "start_line": 17
+                        "start_col": 42,
+                        "start_line": 61
                     }
                 },
-                "184": {
+                "180": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165",
-                        "openzeppelin.introspection.erc165.library.ERC165.supports_interface"
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account.initializer"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 92,
-                        "end_line": 17,
+                        "end_col": 85,
+                        "end_line": 61,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/introspection/erc165/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 92,
-                                "end_line": 17,
+                                "end_col": 79,
+                                "end_line": 21,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/introspection/erc165/library.cairo"
+                                    "filename": "autogen/starknet/storage_var/Account_public_key/decl.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 35,
-                                        "end_line": 21,
+                                        "end_col": 46,
+                                        "end_line": 64,
                                         "input_file": {
-                                            "filename": "/home/cairo-contracts/src/openzeppelin/introspection/erc165/library.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
-                                        "start_col": 13,
-                                        "start_line": 21
+                                        "start_col": 9,
+                                        "start_line": 64
                                     },
                                     "While trying to retrieve the implicit argument 'range_check_ptr' in:"
                                 ],
-                                "start_col": 77,
-                                "start_line": 17
+                                "start_col": 64,
+                                "start_line": 21
                             },
                             "While expanding the reference 'range_check_ptr' in:"
                         ],
-                        "start_col": 77,
-                        "start_line": 17
+                        "start_col": 70,
+                        "start_line": 61
                     }
                 },
-                "185": {
+                "181": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165",
-                        "openzeppelin.introspection.erc165.library.ERC165.supports_interface"
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account.initializer"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 33,
-                        "end_line": 21,
+                        "end_col": 26,
+                        "end_line": 62,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/introspection/erc165/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "start_col": 29,
-                        "start_line": 21
+                        "parent_location": [
+                            {
+                                "end_col": 45,
+                                "end_line": 64,
+                                "input_file": {
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                },
+                                "start_col": 34,
+                                "start_line": 64
+                            },
+                            "While expanding the reference '_public_key' in:"
+                        ],
+                        "start_col": 9,
+                        "start_line": 62
                     }
                 },
-                "187": {
+                "182": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165",
-                        "openzeppelin.introspection.erc165.library.ERC165.supports_interface"
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account.initializer"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 35,
-                        "end_line": 21,
+                        "end_col": 46,
+                        "end_line": 64,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/introspection/erc165/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "start_col": 13,
-                        "start_line": 21
+                        "start_col": 9,
+                        "start_line": 64
                     }
                 },
-                "188": {
+                "184": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165",
-                        "openzeppelin.introspection.erc165.library.ERC165.supports_interface"
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account.initializer"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 47,
-                        "end_line": 17,
+                        "end_col": 19,
+                        "end_line": 65,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/introspection/erc165/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "parent_location": [
-                            {
-                                "end_col": 33,
-                                "end_line": 13,
-                                "input_file": {
-                                    "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/decl.cairo"
-                                },
-                                "parent_location": [
-                                    {
-                                        "end_col": 76,
-                                        "end_line": 25,
-                                        "input_file": {
-                                            "filename": "/home/cairo-contracts/src/openzeppelin/introspection/erc165/library.cairo"
-                                        },
-                                        "start_col": 30,
-                                        "start_line": 25
-                                    },
-                                    "While trying to retrieve the implicit argument 'syscall_ptr' in:"
-                                ],
-                                "start_col": 15,
-                                "start_line": 13
-                            },
-                            "While expanding the reference 'syscall_ptr' in:"
-                        ],
-                        "start_col": 29,
-                        "start_line": 17
+                        "start_col": 9,
+                        "start_line": 65
                     }
                 },
-                "189": {
+                "185": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165",
-                        "openzeppelin.introspection.erc165.library.ERC165.supports_interface"
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account.assert_only_self"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 75,
-                        "end_line": 17,
+                        "end_col": 45,
+                        "end_line": 72,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/introspection/erc165/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 61,
-                                "end_line": 13,
+                                "end_col": 45,
+                                "end_line": 270,
                                 "input_file": {
-                                    "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/decl.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 76,
-                                        "end_line": 25,
+                                        "end_col": 44,
+                                        "end_line": 73,
                                         "input_file": {
-                                            "filename": "/home/cairo-contracts/src/openzeppelin/introspection/erc165/library.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
-                                        "start_col": 30,
-                                        "start_line": 25
+                                        "start_col": 22,
+                                        "start_line": 73
                                     },
-                                    "While trying to retrieve the implicit argument 'pedersen_ptr' in:"
+                                    "While trying to retrieve the implicit argument 'syscall_ptr' in:"
                                 ],
-                                "start_col": 35,
-                                "start_line": 13
+                                "start_col": 27,
+                                "start_line": 270
                             },
-                            "While expanding the reference 'pedersen_ptr' in:"
+                            "While expanding the reference 'syscall_ptr' in:"
                         ],
-                        "start_col": 49,
-                        "start_line": 17
+                        "start_col": 27,
+                        "start_line": 72
                     }
                 },
-                "190": {
+                "186": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165",
-                        "openzeppelin.introspection.erc165.library.ERC165.supports_interface"
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account.assert_only_self"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 92,
-                        "end_line": 17,
+                        "end_col": 44,
+                        "end_line": 73,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/introspection/erc165/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "parent_location": [
-                            {
-                                "end_col": 78,
-                                "end_line": 13,
-                                "input_file": {
-                                    "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/decl.cairo"
-                                },
-                                "parent_location": [
-                                    {
-                                        "end_col": 76,
-                                        "end_line": 25,
-                                        "input_file": {
-                                            "filename": "/home/cairo-contracts/src/openzeppelin/introspection/erc165/library.cairo"
-                                        },
-                                        "start_col": 30,
-                                        "start_line": 25
-                                    },
-                                    "While trying to retrieve the implicit argument 'range_check_ptr' in:"
-                                ],
-                                "start_col": 63,
-                                "start_line": 13
-                            },
-                            "While expanding the reference 'range_check_ptr' in:"
-                        ],
-                        "start_col": 77,
-                        "start_line": 17
+                        "start_col": 22,
+                        "start_line": 73
                     }
                 },
-                "191": {
+                "188": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165",
-                        "openzeppelin.introspection.erc165.library.ERC165.supports_interface"
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account.assert_only_self"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 27,
-                        "end_line": 18,
+                        "end_col": 45,
+                        "end_line": 270,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/introspection/erc165/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 75,
-                                "end_line": 25,
+                                "end_col": 44,
+                                "end_line": 73,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/introspection/erc165/library.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
-                                "start_col": 63,
-                                "start_line": 25
+                                "parent_location": [
+                                    {
+                                        "end_col": 43,
+                                        "end_line": 196,
+                                        "input_file": {
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                                        },
+                                        "parent_location": [
+                                            {
+                                                "end_col": 44,
+                                                "end_line": 74,
+                                                "input_file": {
+                                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                                },
+                                                "start_col": 24,
+                                                "start_line": 74
+                                            },
+                                            "While trying to retrieve the implicit argument 'syscall_ptr' in:"
+                                        ],
+                                        "start_col": 25,
+                                        "start_line": 196
+                                    },
+                                    "While expanding the reference 'syscall_ptr' in:"
+                                ],
+                                "start_col": 22,
+                                "start_line": 73
                             },
-                            "While expanding the reference 'interface_id' in:"
+                            "While trying to update the implicit return value 'syscall_ptr' in:"
                         ],
-                        "start_col": 9,
-                        "start_line": 18
+                        "start_col": 27,
+                        "start_line": 270
                     }
                 },
-                "192": {
+                "189": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165",
-                        "openzeppelin.introspection.erc165.library.ERC165.supports_interface"
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account.assert_only_self"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 76,
-                        "end_line": 25,
+                        "end_col": 44,
+                        "end_line": 74,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/introspection/erc165/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "start_col": 30,
-                        "start_line": 25
+                        "start_col": 24,
+                        "start_line": 74
                     }
                 },
-                "194": {
+                "191": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165",
-                        "openzeppelin.introspection.erc165.library.ERC165.supports_interface"
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account.assert_only_self"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 39,
-                        "end_line": 26,
+                        "end_col": 34,
+                        "end_line": 76,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/introspection/erc165/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "start_col": 9,
-                        "start_line": 26
+                        "start_col": 13,
+                        "start_line": 76
                     }
                 },
-                "195": {
+                "192": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165",
-                        "openzeppelin.introspection.erc165.library.ERC165.register_interface"
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account.assert_only_self"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 27,
-                        "end_line": 30,
+                        "end_col": 43,
+                        "end_line": 196,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/introspection/erc165/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 42,
-                                "end_line": 33,
+                                "end_col": 44,
+                                "end_line": 74,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/introspection/erc165/library.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
-                                "start_col": 30,
-                                "start_line": 33
-                            },
-                            "While expanding the reference 'interface_id' in:"
+                                "parent_location": [
+                                    {
+                                        "end_col": 45,
+                                        "end_line": 72,
+                                        "input_file": {
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                        },
+                                        "parent_location": [
+                                            {
+                                                "end_col": 19,
+                                                "end_line": 78,
+                                                "input_file": {
+                                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                                },
+                                                "start_col": 9,
+                                                "start_line": 78
+                                            },
+                                            "While trying to retrieve the implicit argument 'syscall_ptr' in:"
+                                        ],
+                                        "start_col": 27,
+                                        "start_line": 72
+                                    },
+                                    "While expanding the reference 'syscall_ptr' in:"
+                                ],
+                                "start_col": 24,
+                                "start_line": 74
+                            },
+                            "While trying to update the implicit return value 'syscall_ptr' in:"
                         ],
-                        "start_col": 9,
-                        "start_line": 30
-                    }
-                },
-                "196": {
-                    "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165",
-                        "openzeppelin.introspection.erc165.library.ERC165.register_interface"
-                    ],
-                    "flow_tracking_data": null,
-                    "hints": [],
-                    "inst": {
-                        "end_col": 54,
-                        "end_line": 33,
-                        "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/introspection/erc165/library.cairo"
-                        },
-                        "start_col": 44,
-                        "start_line": 33
+                        "start_col": 25,
+                        "start_line": 196
                     }
                 },
-                "198": {
+                "193": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165",
-                        "openzeppelin.introspection.erc165.library.ERC165.register_interface"
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account.assert_only_self"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 55,
-                        "end_line": 33,
+                        "end_col": 19,
+                        "end_line": 78,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/introspection/erc165/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "start_col": 13,
-                        "start_line": 33
+                        "start_col": 9,
+                        "start_line": 78
                     }
                 },
-                "200": {
+                "194": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165",
-                        "openzeppelin.introspection.erc165.library.ERC165.register_interface"
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account.get_public_key"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 47,
-                        "end_line": 29,
+                        "end_col": 43,
+                        "end_line": 85,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/introspection/erc165/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 34,
-                                "end_line": 21,
+                                "end_col": 33,
+                                "end_line": 13,
                                 "input_file": {
-                                    "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/decl.cairo"
+                                    "filename": "autogen/starknet/storage_var/Account_public_key/decl.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 62,
-                                        "end_line": 35,
+                                        "end_col": 41,
+                                        "end_line": 88,
                                         "input_file": {
-                                            "filename": "/home/cairo-contracts/src/openzeppelin/introspection/erc165/library.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
-                                        "start_col": 9,
-                                        "start_line": 35
+                                        "start_col": 16,
+                                        "start_line": 88
                                     },
                                     "While trying to retrieve the implicit argument 'syscall_ptr' in:"
                                 ],
-                                "start_col": 16,
-                                "start_line": 21
+                                "start_col": 15,
+                                "start_line": 13
                             },
                             "While expanding the reference 'syscall_ptr' in:"
                         ],
-                        "start_col": 29,
-                        "start_line": 29
+                        "start_col": 25,
+                        "start_line": 85
                     }
                 },
-                "201": {
+                "195": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165",
-                        "openzeppelin.introspection.erc165.library.ERC165.register_interface"
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account.get_public_key"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 75,
-                        "end_line": 29,
+                        "end_col": 71,
+                        "end_line": 85,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/introspection/erc165/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 62,
-                                "end_line": 21,
+                                "end_col": 61,
+                                "end_line": 13,
                                 "input_file": {
-                                    "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/decl.cairo"
+                                    "filename": "autogen/starknet/storage_var/Account_public_key/decl.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 62,
-                                        "end_line": 35,
+                                        "end_col": 41,
+                                        "end_line": 88,
                                         "input_file": {
-                                            "filename": "/home/cairo-contracts/src/openzeppelin/introspection/erc165/library.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
-                                        "start_col": 9,
-                                        "start_line": 35
+                                        "start_col": 16,
+                                        "start_line": 88
                                     },
                                     "While trying to retrieve the implicit argument 'pedersen_ptr' in:"
                                 ],
-                                "start_col": 36,
-                                "start_line": 21
+                                "start_col": 35,
+                                "start_line": 13
                             },
                             "While expanding the reference 'pedersen_ptr' in:"
                         ],
-                        "start_col": 49,
-                        "start_line": 29
+                        "start_col": 45,
+                        "start_line": 85
                     }
                 },
-                "202": {
+                "196": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165",
-                        "openzeppelin.introspection.erc165.library.ERC165.register_interface"
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account.get_public_key"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 92,
-                        "end_line": 29,
+                        "end_col": 88,
+                        "end_line": 85,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/introspection/erc165/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 79,
-                                "end_line": 21,
+                                "end_col": 78,
+                                "end_line": 13,
                                 "input_file": {
-                                    "filename": "autogen/starknet/storage_var/ERC165_supported_interfaces/decl.cairo"
+                                    "filename": "autogen/starknet/storage_var/Account_public_key/decl.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 62,
-                                        "end_line": 35,
+                                        "end_col": 41,
+                                        "end_line": 88,
                                         "input_file": {
-                                            "filename": "/home/cairo-contracts/src/openzeppelin/introspection/erc165/library.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
-                                        "start_col": 9,
-                                        "start_line": 35
+                                        "start_col": 16,
+                                        "start_line": 88
                                     },
                                     "While trying to retrieve the implicit argument 'range_check_ptr' in:"
                                 ],
-                                "start_col": 64,
-                                "start_line": 21
+                                "start_col": 63,
+                                "start_line": 13
                             },
                             "While expanding the reference 'range_check_ptr' in:"
                         ],
-                        "start_col": 77,
-                        "start_line": 29
+                        "start_col": 73,
+                        "start_line": 85
                     }
                 },
-                "203": {
+                "197": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165",
-                        "openzeppelin.introspection.erc165.library.ERC165.register_interface"
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account.get_public_key"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 27,
-                        "end_line": 30,
+                        "end_col": 41,
+                        "end_line": 88,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/introspection/erc165/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "parent_location": [
-                            {
-                                "end_col": 55,
-                                "end_line": 35,
-                                "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/introspection/erc165/library.cairo"
-                                },
-                                "start_col": 43,
-                                "start_line": 35
-                            },
-                            "While expanding the reference 'interface_id' in:"
-                        ],
-                        "start_col": 9,
-                        "start_line": 30
+                        "start_col": 16,
+                        "start_line": 88
                     }
                 },
-                "204": {
+                "199": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165",
-                        "openzeppelin.introspection.erc165.library.ERC165.register_interface"
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account.get_public_key"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 61,
-                        "end_line": 35,
+                        "end_col": 42,
+                        "end_line": 88,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/introspection/erc165/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "start_col": 57,
-                        "start_line": 35
+                        "start_col": 9,
+                        "start_line": 88
                     }
                 },
-                "206": {
+                "200": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165",
-                        "openzeppelin.introspection.erc165.library.ERC165.register_interface"
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account.supports_interface"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 62,
-                        "end_line": 35,
+                        "end_col": 39,
+                        "end_line": 94,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/introspection/erc165/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "start_col": 9,
-                        "start_line": 35
+                        "start_col": 13,
+                        "start_line": 94
                     }
                 },
-                "208": {
+                "202": {
                     "accessible_scopes": [
-                        "openzeppelin.introspection.erc165.library",
-                        "openzeppelin.introspection.erc165.library.ERC165",
-                        "openzeppelin.introspection.erc165.library.ERC165.register_interface"
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account.supports_interface"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 19,
-                        "end_line": 36,
+                        "end_col": 11,
+                        "end_line": 94,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/introspection/erc165/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 9,
-                        "start_line": 36
+                        "start_line": 94
                     }
                 },
-                "209": {
+                "204": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account_public_key",
-                        "openzeppelin.account.library.Account_public_key.addr"
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account.supports_interface"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 41,
-                        "end_line": 7,
+                        "end_col": 47,
+                        "end_line": 91,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 41,
-                                "end_line": 7,
+                                "end_col": 47,
+                                "end_line": 91,
                                 "input_file": {
-                                    "filename": "autogen/starknet/storage_var/Account_public_key/decl.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 26,
-                                        "end_line": 9,
+                                        "end_col": 35,
+                                        "end_line": 95,
                                         "input_file": {
-                                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
-                                        "start_col": 9,
-                                        "start_line": 9
+                                        "start_col": 13,
+                                        "start_line": 95
                                     },
-                                    "While trying to retrieve the implicit argument 'pedersen_ptr' in:"
+                                    "While trying to retrieve the implicit argument 'syscall_ptr' in:"
                                 ],
-                                "start_col": 15,
-                                "start_line": 7
+                                "start_col": 29,
+                                "start_line": 91
                             },
-                            "While expanding the reference 'pedersen_ptr' in:"
+                            "While expanding the reference 'syscall_ptr' in:"
                         ],
-                        "start_col": 15,
-                        "start_line": 7
+                        "start_col": 29,
+                        "start_line": 91
                     }
                 },
-                "210": {
+                "205": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account_public_key",
-                        "openzeppelin.account.library.Account_public_key.addr"
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account.supports_interface"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 58,
-                        "end_line": 7,
+                        "end_col": 75,
+                        "end_line": 91,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 58,
-                                "end_line": 7,
+                                "end_col": 75,
+                                "end_line": 91,
                                 "input_file": {
-                                    "filename": "autogen/starknet/storage_var/Account_public_key/decl.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 26,
-                                        "end_line": 9,
+                                        "end_col": 35,
+                                        "end_line": 95,
                                         "input_file": {
-                                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
-                                        "start_col": 9,
-                                        "start_line": 9
+                                        "start_col": 13,
+                                        "start_line": 95
                                     },
-                                    "While trying to retrieve the implicit argument 'range_check_ptr' in:"
+                                    "While trying to retrieve the implicit argument 'pedersen_ptr' in:"
                                 ],
-                                "start_col": 43,
-                                "start_line": 7
+                                "start_col": 49,
+                                "start_line": 91
                             },
-                            "While expanding the reference 'range_check_ptr' in:"
+                            "While expanding the reference 'pedersen_ptr' in:"
                         ],
-                        "start_col": 43,
-                        "start_line": 7
+                        "start_col": 49,
+                        "start_line": 91
                     }
                 },
-                "211": {
+                "206": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account_public_key",
-                        "openzeppelin.account.library.Account_public_key.addr"
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account.supports_interface"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 94,
-                        "end_line": 8,
+                        "end_col": 92,
+                        "end_line": 91,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 24,
-                                "end_line": 9,
-                                "input_file": {
-                                    "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
+                                "end_col": 92,
+                                "end_line": 91,
+                                "input_file": {
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
-                                "start_col": 21,
-                                "start_line": 9
+                                "parent_location": [
+                                    {
+                                        "end_col": 35,
+                                        "end_line": 95,
+                                        "input_file": {
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                        },
+                                        "start_col": 13,
+                                        "start_line": 95
+                                    },
+                                    "While trying to retrieve the implicit argument 'range_check_ptr' in:"
+                                ],
+                                "start_col": 77,
+                                "start_line": 91
                             },
-                            "While expanding the reference 'res' in:"
+                            "While expanding the reference 'range_check_ptr' in:"
                         ],
-                        "start_col": 19,
-                        "start_line": 8
+                        "start_col": 77,
+                        "start_line": 91
                     }
                 },
-                "213": {
+                "207": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account_public_key",
-                        "openzeppelin.account.library.Account_public_key.addr"
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account.supports_interface"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 26,
-                        "end_line": 9,
+                        "end_col": 33,
+                        "end_line": 95,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                        },
+                        "start_col": 29,
+                        "start_line": 95
+                    }
+                },
+                "209": {
+                    "accessible_scopes": [
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account.supports_interface"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 35,
+                        "end_line": 95,
+                        "input_file": {
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                        },
+                        "start_col": 13,
+                        "start_line": 95
+                    }
+                },
+                "210": {
+                    "accessible_scopes": [
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account.supports_interface"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 40,
+                        "end_line": 97,
+                        "input_file": {
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                        },
+                        "start_col": 13,
+                        "start_line": 97
+                    }
+                },
+                "212": {
+                    "accessible_scopes": [
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account.supports_interface"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 11,
+                        "end_line": 97,
+                        "input_file": {
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 9,
-                        "start_line": 9
+                        "start_line": 97
                     }
                 },
                 "214": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account_public_key",
-                        "openzeppelin.account.library.Account_public_key.read"
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account.supports_interface"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 61,
-                        "end_line": 12,
+                        "end_col": 47,
+                        "end_line": 91,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 41,
-                                "end_line": 7,
+                                "end_col": 47,
+                                "end_line": 91,
                                 "input_file": {
-                                    "filename": "autogen/starknet/storage_var/Account_public_key/decl.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 36,
-                                        "end_line": 15,
+                                        "end_col": 35,
+                                        "end_line": 98,
                                         "input_file": {
-                                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
-                                        "start_col": 30,
-                                        "start_line": 15
+                                        "start_col": 13,
+                                        "start_line": 98
                                     },
-                                    "While trying to retrieve the implicit argument 'pedersen_ptr' in:"
+                                    "While trying to retrieve the implicit argument 'syscall_ptr' in:"
                                 ],
-                                "start_col": 15,
-                                "start_line": 7
+                                "start_col": 29,
+                                "start_line": 91
                             },
-                            "While expanding the reference 'pedersen_ptr' in:"
+                            "While expanding the reference 'syscall_ptr' in:"
                         ],
-                        "start_col": 35,
-                        "start_line": 12
+                        "start_col": 29,
+                        "start_line": 91
                     }
                 },
                 "215": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account_public_key",
-                        "openzeppelin.account.library.Account_public_key.read"
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account.supports_interface"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 78,
-                        "end_line": 12,
+                        "end_col": 75,
+                        "end_line": 91,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 58,
-                                "end_line": 7,
+                                "end_col": 75,
+                                "end_line": 91,
                                 "input_file": {
-                                    "filename": "autogen/starknet/storage_var/Account_public_key/decl.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 36,
-                                        "end_line": 15,
+                                        "end_col": 35,
+                                        "end_line": 98,
                                         "input_file": {
-                                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
-                                        "start_col": 30,
-                                        "start_line": 15
+                                        "start_col": 13,
+                                        "start_line": 98
                                     },
-                                    "While trying to retrieve the implicit argument 'range_check_ptr' in:"
+                                    "While trying to retrieve the implicit argument 'pedersen_ptr' in:"
                                 ],
-                                "start_col": 43,
-                                "start_line": 7
+                                "start_col": 49,
+                                "start_line": 91
                             },
-                            "While expanding the reference 'range_check_ptr' in:"
+                            "While expanding the reference 'pedersen_ptr' in:"
                         ],
-                        "start_col": 63,
-                        "start_line": 12
+                        "start_col": 49,
+                        "start_line": 91
                     }
                 },
                 "216": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account_public_key",
-                        "openzeppelin.account.library.Account_public_key.read"
-                    ],
-                    "flow_tracking_data": null,
-                    "hints": [],
-                    "inst": {
-                        "end_col": 36,
-                        "end_line": 15,
-                        "input_file": {
-                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
-                        },
-                        "start_col": 30,
-                        "start_line": 15
-                    }
-                },
-                "218": {
-                    "accessible_scopes": [
-                        "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account_public_key",
-                        "openzeppelin.account.library.Account_public_key.read"
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account.supports_interface"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 33,
-                        "end_line": 12,
+                        "end_col": 92,
+                        "end_line": 91,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 37,
-                                "end_line": 348,
+                                "end_col": 92,
+                                "end_line": 91,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 75,
-                                        "end_line": 16,
+                                        "end_col": 35,
+                                        "end_line": 98,
                                         "input_file": {
-                                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
-                                        "start_col": 37,
-                                        "start_line": 16
+                                        "start_col": 13,
+                                        "start_line": 98
                                     },
-                                    "While trying to retrieve the implicit argument 'syscall_ptr' in:"
+                                    "While trying to retrieve the implicit argument 'range_check_ptr' in:"
                                 ],
-                                "start_col": 19,
-                                "start_line": 348
+                                "start_col": 77,
+                                "start_line": 91
                             },
-                            "While expanding the reference 'syscall_ptr' in:"
+                            "While expanding the reference 'range_check_ptr' in:"
                         ],
-                        "start_col": 15,
-                        "start_line": 12
+                        "start_col": 77,
+                        "start_line": 91
                     }
                 },
-                "219": {
+                "217": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account_public_key",
-                        "openzeppelin.account.library.Account_public_key.read"
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account.supports_interface"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 26,
-                        "end_line": 15,
+                        "end_col": 33,
+                        "end_line": 98,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "parent_location": [
-                            {
-                                "end_col": 70,
-                                "end_line": 16,
-                                "input_file": {
-                                    "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
-                                },
-                                "start_col": 58,
-                                "start_line": 16
-                            },
-                            "While expanding the reference 'storage_addr' in:"
-                        ],
-                        "start_col": 14,
-                        "start_line": 15
+                        "start_col": 29,
+                        "start_line": 98
                     }
                 },
-                "220": {
+                "219": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account_public_key",
-                        "openzeppelin.account.library.Account_public_key.read"
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account.supports_interface"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 75,
-                        "end_line": 16,
+                        "end_col": 35,
+                        "end_line": 98,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "start_col": 37,
-                        "start_line": 16
+                        "start_col": 13,
+                        "start_line": 98
                     }
                 },
-                "222": {
+                "220": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account_public_key",
-                        "openzeppelin.account.library.Account_public_key.read"
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account.supports_interface"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 37,
-                        "end_line": 348,
+                        "end_col": 47,
+                        "end_line": 91,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 75,
-                                "end_line": 16,
+                                "end_col": 47,
+                                "end_line": 91,
                                 "input_file": {
-                                    "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 42,
-                                        "end_line": 18,
+                                        "end_col": 32,
+                                        "end_line": 100,
                                         "input_file": {
-                                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
-                                        "start_col": 31,
-                                        "start_line": 18
+                                        "start_col": 9,
+                                        "start_line": 100
                                     },
-                                    "While expanding the reference 'syscall_ptr' in:"
+                                    "While trying to retrieve the implicit argument 'syscall_ptr' in:"
                                 ],
-                                "start_col": 37,
-                                "start_line": 16
+                                "start_col": 29,
+                                "start_line": 91
                             },
-                            "While trying to update the implicit return value 'syscall_ptr' in:"
+                            "While expanding the reference 'syscall_ptr' in:"
                         ],
-                        "start_col": 19,
-                        "start_line": 348
+                        "start_col": 29,
+                        "start_line": 91
                     }
                 },
-                "223": {
+                "221": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account_public_key",
-                        "openzeppelin.account.library.Account_public_key.read"
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account.supports_interface"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 41,
-                        "end_line": 7,
+                        "end_col": 75,
+                        "end_line": 91,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/Account_public_key/decl.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 36,
-                                "end_line": 15,
+                                "end_col": 75,
+                                "end_line": 91,
                                 "input_file": {
-                                    "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 44,
-                                        "end_line": 19,
+                                        "end_col": 32,
+                                        "end_line": 100,
                                         "input_file": {
-                                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
-                                        "start_col": 32,
-                                        "start_line": 19
+                                        "start_col": 9,
+                                        "start_line": 100
                                     },
-                                    "While expanding the reference 'pedersen_ptr' in:"
+                                    "While trying to retrieve the implicit argument 'pedersen_ptr' in:"
                                 ],
-                                "start_col": 30,
-                                "start_line": 15
+                                "start_col": 49,
+                                "start_line": 91
                             },
-                            "While trying to update the implicit return value 'pedersen_ptr' in:"
+                            "While expanding the reference 'pedersen_ptr' in:"
                         ],
-                        "start_col": 15,
-                        "start_line": 7
+                        "start_col": 49,
+                        "start_line": 91
                     }
                 },
-                "224": {
+                "222": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account_public_key",
-                        "openzeppelin.account.library.Account_public_key.read"
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account.supports_interface"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 58,
-                        "end_line": 7,
+                        "end_col": 92,
+                        "end_line": 91,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/Account_public_key/decl.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 36,
-                                "end_line": 15,
+                                "end_col": 92,
+                                "end_line": 91,
                                 "input_file": {
-                                    "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 50,
-                                        "end_line": 20,
+                                        "end_col": 32,
+                                        "end_line": 100,
                                         "input_file": {
-                                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
-                                        "start_col": 35,
-                                        "start_line": 20
+                                        "start_col": 9,
+                                        "start_line": 100
                                     },
-                                    "While expanding the reference 'range_check_ptr' in:"
+                                    "While trying to retrieve the implicit argument 'range_check_ptr' in:"
                                 ],
-                                "start_col": 30,
-                                "start_line": 15
+                                "start_col": 77,
+                                "start_line": 91
                             },
-                            "While trying to update the implicit return value 'range_check_ptr' in:"
+                            "While expanding the reference 'range_check_ptr' in:"
                         ],
-                        "start_col": 43,
-                        "start_line": 7
+                        "start_col": 77,
+                        "start_line": 91
                     }
                 },
-                "225": {
+                "223": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account_public_key",
-                        "openzeppelin.account.library.Account_public_key.read"
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account.supports_interface"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 33,
-                        "end_line": 16,
+                        "end_col": 30,
+                        "end_line": 100,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "parent_location": [
-                            {
-                                "end_col": 64,
-                                "end_line": 21,
-                                "input_file": {
-                                    "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
-                                },
-                                "start_col": 45,
-                                "start_line": 21
-                            },
-                            "While expanding the reference '__storage_var_temp0' in:"
-                        ],
-                        "start_col": 14,
-                        "start_line": 16
+                        "start_col": 25,
+                        "start_line": 100
                     }
                 },
-                "226": {
+                "225": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account_public_key",
-                        "openzeppelin.account.library.Account_public_key.read"
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account.supports_interface"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 55,
-                        "end_line": 22,
+                        "end_col": 32,
+                        "end_line": 100,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 9,
-                        "start_line": 22
+                        "start_line": 100
                     }
                 },
-                "227": {
+                "226": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account_public_key",
-                        "openzeppelin.account.library.Account_public_key.write"
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account.set_public_key"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 62,
-                        "end_line": 25,
+                        "end_col": 43,
+                        "end_line": 107,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 41,
-                                "end_line": 7,
+                                "end_col": 45,
+                                "end_line": 72,
                                 "input_file": {
-                                    "filename": "autogen/starknet/storage_var/Account_public_key/decl.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 36,
-                                        "end_line": 26,
+                                        "end_col": 27,
+                                        "end_line": 110,
                                         "input_file": {
-                                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
-                                        "start_col": 30,
-                                        "start_line": 26
+                                        "start_col": 9,
+                                        "start_line": 110
                                     },
-                                    "While trying to retrieve the implicit argument 'pedersen_ptr' in:"
+                                    "While trying to retrieve the implicit argument 'syscall_ptr' in:"
                                 ],
-                                "start_col": 15,
-                                "start_line": 7
+                                "start_col": 27,
+                                "start_line": 72
                             },
-                            "While expanding the reference 'pedersen_ptr' in:"
+                            "While expanding the reference 'syscall_ptr' in:"
                         ],
-                        "start_col": 36,
-                        "start_line": 25
+                        "start_col": 25,
+                        "start_line": 107
                     }
                 },
-                "228": {
+                "227": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account_public_key",
-                        "openzeppelin.account.library.Account_public_key.write"
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account.set_public_key"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 79,
-                        "end_line": 25,
+                        "end_col": 27,
+                        "end_line": 110,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                        },
+                        "start_col": 9,
+                        "start_line": 110
+                    }
+                },
+                "229": {
+                    "accessible_scopes": [
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account.set_public_key"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 71,
+                        "end_line": 107,
+                        "input_file": {
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 58,
-                                "end_line": 7,
+                                "end_col": 62,
+                                "end_line": 21,
                                 "input_file": {
                                     "filename": "autogen/starknet/storage_var/Account_public_key/decl.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 36,
-                                        "end_line": 26,
+                                        "end_col": 49,
+                                        "end_line": 111,
                                         "input_file": {
-                                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
-                                        "start_col": 30,
-                                        "start_line": 26
+                                        "start_col": 9,
+                                        "start_line": 111
                                     },
-                                    "While trying to retrieve the implicit argument 'range_check_ptr' in:"
+                                    "While trying to retrieve the implicit argument 'pedersen_ptr' in:"
                                 ],
-                                "start_col": 43,
-                                "start_line": 7
+                                "start_col": 36,
+                                "start_line": 21
                             },
-                            "While expanding the reference 'range_check_ptr' in:"
+                            "While expanding the reference 'pedersen_ptr' in:"
                         ],
-                        "start_col": 64,
-                        "start_line": 25
-                    }
-                },
-                "229": {
-                    "accessible_scopes": [
-                        "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account_public_key",
-                        "openzeppelin.account.library.Account_public_key.write"
-                    ],
-                    "flow_tracking_data": null,
-                    "hints": [],
-                    "inst": {
-                        "end_col": 36,
-                        "end_line": 26,
-                        "input_file": {
-                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
-                        },
-                        "start_col": 30,
-                        "start_line": 26
+                        "start_col": 45,
+                        "start_line": 107
                     }
                 },
-                "231": {
+                "230": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account_public_key",
-                        "openzeppelin.account.library.Account_public_key.write"
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account.set_public_key"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 34,
-                        "end_line": 25,
+                        "end_col": 88,
+                        "end_line": 107,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 38,
-                                "end_line": 366,
+                                "end_col": 79,
+                                "end_line": 21,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                                    "filename": "autogen/starknet/storage_var/Account_public_key/decl.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 80,
-                                        "end_line": 27,
+                                        "end_col": 49,
+                                        "end_line": 111,
                                         "input_file": {
-                                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "start_col": 9,
-                                        "start_line": 27
+                                        "start_line": 111
                                     },
-                                    "While trying to retrieve the implicit argument 'syscall_ptr' in:"
+                                    "While trying to retrieve the implicit argument 'range_check_ptr' in:"
                                 ],
-                                "start_col": 20,
-                                "start_line": 366
+                                "start_col": 64,
+                                "start_line": 21
                             },
-                            "While expanding the reference 'syscall_ptr' in:"
+                            "While expanding the reference 'range_check_ptr' in:"
                         ],
-                        "start_col": 16,
-                        "start_line": 25
+                        "start_col": 73,
+                        "start_line": 107
                     }
                 },
-                "232": {
+                "231": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account_public_key",
-                        "openzeppelin.account.library.Account_public_key.write"
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account.set_public_key"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 26,
-                        "end_line": 26,
+                        "end_col": 29,
+                        "end_line": 108,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 43,
-                                "end_line": 27,
+                                "end_col": 48,
+                                "end_line": 111,
                                 "input_file": {
-                                    "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
-                                "start_col": 31,
-                                "start_line": 27
+                                "start_col": 34,
+                                "start_line": 111
                             },
-                            "While expanding the reference 'storage_addr' in:"
+                            "While expanding the reference 'new_public_key' in:"
                         ],
-                        "start_col": 14,
-                        "start_line": 26
+                        "start_col": 9,
+                        "start_line": 108
                     }
                 },
-                "233": {
+                "232": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account_public_key",
-                        "openzeppelin.account.library.Account_public_key.write"
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account.set_public_key"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 79,
-                        "end_line": 27,
+                        "end_col": 49,
+                        "end_line": 111,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "start_col": 55,
-                        "start_line": 27
+                        "start_col": 9,
+                        "start_line": 111
                     }
                 },
                 "234": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account_public_key",
-                        "openzeppelin.account.library.Account_public_key.write"
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account.set_public_key"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 80,
-                        "end_line": 27,
+                        "end_col": 19,
+                        "end_line": 112,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 9,
-                        "start_line": 27
+                        "start_line": 112
                     }
                 },
-                "236": {
+                "235": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account_public_key",
-                        "openzeppelin.account.library.Account_public_key.write"
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account.is_valid_signature"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 41,
-                        "end_line": 7,
+                        "end_col": 27,
+                        "end_line": 120,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/Account_public_key/decl.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 36,
-                                "end_line": 26,
+                                "end_col": 33,
+                                "end_line": 13,
                                 "input_file": {
-                                    "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
+                                    "filename": "autogen/starknet/storage_var/Account_public_key/decl.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 62,
-                                        "end_line": 21,
+                                        "end_col": 54,
+                                        "end_line": 125,
                                         "input_file": {
-                                            "filename": "autogen/starknet/storage_var/Account_public_key/decl.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
-                                        "parent_location": [
-                                            {
-                                                "end_col": 19,
-                                                "end_line": 28,
-                                                "input_file": {
-                                                    "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
-                                                },
-                                                "start_col": 9,
-                                                "start_line": 28
-                                            },
-                                            "While trying to retrieve the implicit argument 'pedersen_ptr' in:"
-                                        ],
-                                        "start_col": 36,
-                                        "start_line": 21
+                                        "start_col": 29,
+                                        "start_line": 125
                                     },
-                                    "While expanding the reference 'pedersen_ptr' in:"
+                                    "While trying to retrieve the implicit argument 'syscall_ptr' in:"
                                 ],
-                                "start_col": 30,
-                                "start_line": 26
+                                "start_col": 15,
+                                "start_line": 13
                             },
-                            "While trying to update the implicit return value 'pedersen_ptr' in:"
+                            "While expanding the reference 'syscall_ptr' in:"
                         ],
-                        "start_col": 15,
-                        "start_line": 7
+                        "start_col": 9,
+                        "start_line": 120
                     }
                 },
-                "237": {
+                "236": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account_public_key",
-                        "openzeppelin.account.library.Account_public_key.write"
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account.is_valid_signature"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 58,
-                        "end_line": 7,
+                        "end_col": 35,
+                        "end_line": 121,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/Account_public_key/decl.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 36,
-                                "end_line": 26,
+                                "end_col": 61,
+                                "end_line": 13,
                                 "input_file": {
-                                    "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
+                                    "filename": "autogen/starknet/storage_var/Account_public_key/decl.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 79,
-                                        "end_line": 21,
+                                        "end_col": 54,
+                                        "end_line": 125,
                                         "input_file": {
-                                            "filename": "autogen/starknet/storage_var/Account_public_key/decl.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
-                                        "parent_location": [
-                                            {
-                                                "end_col": 19,
-                                                "end_line": 28,
-                                                "input_file": {
-                                                    "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
-                                                },
-                                                "start_col": 9,
-                                                "start_line": 28
-                                            },
-                                            "While trying to retrieve the implicit argument 'range_check_ptr' in:"
-                                        ],
-                                        "start_col": 64,
-                                        "start_line": 21
+                                        "start_col": 29,
+                                        "start_line": 125
                                     },
-                                    "While expanding the reference 'range_check_ptr' in:"
+                                    "While trying to retrieve the implicit argument 'pedersen_ptr' in:"
                                 ],
-                                "start_col": 30,
-                                "start_line": 26
+                                "start_col": 35,
+                                "start_line": 13
                             },
-                            "While trying to update the implicit return value 'range_check_ptr' in:"
+                            "While expanding the reference 'pedersen_ptr' in:"
                         ],
-                        "start_col": 43,
-                        "start_line": 7
-                    }
-                },
-                "238": {
-                    "accessible_scopes": [
-                        "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account_public_key",
-                        "openzeppelin.account.library.Account_public_key.write"
-                    ],
-                    "flow_tracking_data": null,
-                    "hints": [],
-                    "inst": {
-                        "end_col": 19,
-                        "end_line": 28,
-                        "input_file": {
-                            "filename": "autogen/starknet/storage_var/Account_public_key/impl.cairo"
-                        },
                         "start_col": 9,
-                        "start_line": 28
+                        "start_line": 121
                     }
                 },
-                "239": {
+                "237": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.initializer"
+                        "openzeppelin.account.library.Account.is_valid_signature"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 40,
-                        "end_line": 57,
+                        "end_col": 24,
+                        "end_line": 123,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 34,
-                                "end_line": 21,
+                                "end_col": 78,
+                                "end_line": 13,
                                 "input_file": {
                                     "filename": "autogen/starknet/storage_var/Account_public_key/decl.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 46,
-                                        "end_line": 60,
+                                        "end_col": 54,
+                                        "end_line": 125,
                                         "input_file": {
-                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
-                                        "start_col": 9,
-                                        "start_line": 60
+                                        "start_col": 29,
+                                        "start_line": 125
                                     },
-                                    "While trying to retrieve the implicit argument 'syscall_ptr' in:"
+                                    "While trying to retrieve the implicit argument 'range_check_ptr' in:"
                                 ],
-                                "start_col": 16,
-                                "start_line": 21
+                                "start_col": 63,
+                                "start_line": 13
                             },
-                            "While expanding the reference 'syscall_ptr' in:"
+                            "While expanding the reference 'range_check_ptr' in:"
                         ],
-                        "start_col": 22,
-                        "start_line": 57
+                        "start_col": 9,
+                        "start_line": 123
+                    }
+                },
+                "238": {
+                    "accessible_scopes": [
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account.is_valid_signature"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 54,
+                        "end_line": 125,
+                        "input_file": {
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                        },
+                        "start_col": 29,
+                        "start_line": 125
                     }
                 },
                 "240": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.initializer"
+                        "openzeppelin.account.library.Account.is_valid_signature"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 68,
-                        "end_line": 57,
+                        "end_col": 37,
+                        "end_line": 122,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 62,
-                                "end_line": 21,
+                                "end_col": 57,
+                                "end_line": 10,
                                 "input_file": {
-                                    "filename": "autogen/starknet/storage_var/Account_public_key/decl.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/signature.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 46,
-                                        "end_line": 60,
+                                        "end_col": 10,
+                                        "end_line": 135,
                                         "input_file": {
-                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "start_col": 9,
-                                        "start_line": 60
+                                        "start_line": 133
                                     },
-                                    "While trying to retrieve the implicit argument 'pedersen_ptr' in:"
+                                    "While trying to retrieve the implicit argument 'ecdsa_ptr' in:"
                                 ],
-                                "start_col": 36,
-                                "start_line": 21
+                                "start_col": 29,
+                                "start_line": 10
                             },
-                            "While expanding the reference 'pedersen_ptr' in:"
+                            "While expanding the reference 'ecdsa_ptr' in:"
                         ],
-                        "start_col": 42,
-                        "start_line": 57
+                        "start_col": 9,
+                        "start_line": 122
                     }
                 },
                 "241": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.initializer"
+                        "openzeppelin.account.library.Account.is_valid_signature"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 85,
-                        "end_line": 57,
+                        "end_col": 17,
+                        "end_line": 124,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 79,
-                                "end_line": 21,
+                                "end_col": 25,
+                                "end_line": 134,
                                 "input_file": {
-                                    "filename": "autogen/starknet/storage_var/Account_public_key/decl.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
-                                "parent_location": [
-                                    {
-                                        "end_col": 46,
-                                        "end_line": 60,
-                                        "input_file": {
-                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                                        },
-                                        "start_col": 9,
-                                        "start_line": 60
-                                    },
-                                    "While trying to retrieve the implicit argument 'range_check_ptr' in:"
-                                ],
-                                "start_col": 64,
-                                "start_line": 21
+                                "start_col": 21,
+                                "start_line": 134
                             },
-                            "While expanding the reference 'range_check_ptr' in:"
+                            "While expanding the reference 'hash' in:"
                         ],
-                        "start_col": 70,
-                        "start_line": 57
+                        "start_col": 7,
+                        "start_line": 124
                     }
                 },
                 "242": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.initializer"
+                        "openzeppelin.account.library.Account.is_valid_signature"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 26,
-                        "end_line": 58,
+                        "end_col": 25,
+                        "end_line": 125,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 45,
-                                "end_line": 60,
+                                "end_col": 49,
+                                "end_line": 134,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
-                                "start_col": 34,
-                                "start_line": 60
+                                "start_col": 38,
+                                "start_line": 134
                             },
                             "While expanding the reference '_public_key' in:"
                         ],
-                        "start_col": 9,
-                        "start_line": 58
+                        "start_col": 14,
+                        "start_line": 125
                     }
                 },
                 "243": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.initializer"
+                        "openzeppelin.account.library.Account.is_valid_signature"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 46,
-                        "end_line": 60,
+                        "end_col": 33,
+                        "end_line": 130,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "start_col": 9,
-                        "start_line": 60
-                    }
-                },
-                "245": {
-                    "accessible_scopes": [
-                        "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.initializer"
-                    ],
-                    "flow_tracking_data": null,
-                    "hints": [],
-                    "inst": {
-                        "end_col": 46,
-                        "end_line": 61,
-                        "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                        },
-                        "start_col": 35,
-                        "start_line": 61
+                        "parent_location": [
+                            {
+                                "end_col": 68,
+                                "end_line": 134,
+                                "input_file": {
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                },
+                                "start_col": 63,
+                                "start_line": 134
+                            },
+                            "While expanding the reference 'sig_r' in:"
+                        ],
+                        "start_col": 21,
+                        "start_line": 130
                     }
                 },
-                "247": {
+                "244": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.initializer"
+                        "openzeppelin.account.library.Account.is_valid_signature"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 47,
-                        "end_line": 61,
+                        "end_col": 33,
+                        "end_line": 131,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "start_col": 9,
-                        "start_line": 61
+                        "parent_location": [
+                            {
+                                "end_col": 87,
+                                "end_line": 134,
+                                "input_file": {
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                },
+                                "start_col": 82,
+                                "start_line": 134
+                            },
+                            "While expanding the reference 'sig_s' in:"
+                        ],
+                        "start_col": 21,
+                        "start_line": 131
                     }
                 },
-                "249": {
+                "245": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.initializer"
+                        "openzeppelin.account.library.Account.is_valid_signature"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 19,
-                        "end_line": 62,
+                        "end_col": 10,
+                        "end_line": 135,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 9,
-                        "start_line": 62
+                        "start_line": 133
                     }
                 },
-                "250": {
+                "247": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.assert_only_self"
+                        "openzeppelin.account.library.Account.is_valid_signature"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 45,
-                        "end_line": 69,
+                        "end_col": 33,
+                        "end_line": 13,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "autogen/starknet/storage_var/Account_public_key/decl.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 45,
-                                "end_line": 270,
+                                "end_col": 54,
+                                "end_line": 125,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 44,
-                                        "end_line": 70,
+                                        "end_col": 27,
+                                        "end_line": 120,
                                         "input_file": {
-                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
-                                        "start_col": 22,
-                                        "start_line": 70
+                                        "parent_location": [
+                                            {
+                                                "end_col": 32,
+                                                "end_line": 137,
+                                                "input_file": {
+                                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                                },
+                                                "start_col": 9,
+                                                "start_line": 137
+                                            },
+                                            "While trying to retrieve the implicit argument 'syscall_ptr' in:"
+                                        ],
+                                        "start_col": 9,
+                                        "start_line": 120
                                     },
-                                    "While trying to retrieve the implicit argument 'syscall_ptr' in:"
+                                    "While expanding the reference 'syscall_ptr' in:"
                                 ],
-                                "start_col": 27,
-                                "start_line": 270
+                                "start_col": 29,
+                                "start_line": 125
                             },
-                            "While expanding the reference 'syscall_ptr' in:"
+                            "While trying to update the implicit return value 'syscall_ptr' in:"
                         ],
-                        "start_col": 27,
-                        "start_line": 69
-                    }
-                },
-                "251": {
-                    "accessible_scopes": [
-                        "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.assert_only_self"
-                    ],
-                    "flow_tracking_data": null,
-                    "hints": [],
-                    "inst": {
-                        "end_col": 44,
-                        "end_line": 70,
-                        "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                        },
-                        "start_col": 22,
-                        "start_line": 70
+                        "start_col": 15,
+                        "start_line": 13
                     }
                 },
-                "253": {
+                "248": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.assert_only_self"
+                        "openzeppelin.account.library.Account.is_valid_signature"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 45,
-                        "end_line": 270,
+                        "end_col": 61,
+                        "end_line": 13,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "autogen/starknet/storage_var/Account_public_key/decl.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 44,
-                                "end_line": 70,
+                                "end_col": 54,
+                                "end_line": 125,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 43,
-                                        "end_line": 196,
+                                        "end_col": 35,
+                                        "end_line": 121,
                                         "input_file": {
-                                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "parent_location": [
                                             {
-                                                "end_col": 44,
-                                                "end_line": 71,
+                                                "end_col": 32,
+                                                "end_line": 137,
                                                 "input_file": {
-                                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                                 },
-                                                "start_col": 24,
-                                                "start_line": 71
+                                                "start_col": 9,
+                                                "start_line": 137
                                             },
-                                            "While trying to retrieve the implicit argument 'syscall_ptr' in:"
+                                            "While trying to retrieve the implicit argument 'pedersen_ptr' in:"
                                         ],
-                                        "start_col": 25,
-                                        "start_line": 196
+                                        "start_col": 9,
+                                        "start_line": 121
                                     },
-                                    "While expanding the reference 'syscall_ptr' in:"
+                                    "While expanding the reference 'pedersen_ptr' in:"
                                 ],
-                                "start_col": 22,
-                                "start_line": 70
+                                "start_col": 29,
+                                "start_line": 125
                             },
-                            "While trying to update the implicit return value 'syscall_ptr' in:"
+                            "While trying to update the implicit return value 'pedersen_ptr' in:"
                         ],
-                        "start_col": 27,
-                        "start_line": 270
-                    }
-                },
-                "254": {
-                    "accessible_scopes": [
-                        "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.assert_only_self"
-                    ],
-                    "flow_tracking_data": null,
-                    "hints": [],
-                    "inst": {
-                        "end_col": 44,
-                        "end_line": 71,
-                        "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                        },
-                        "start_col": 24,
-                        "start_line": 71
+                        "start_col": 35,
+                        "start_line": 13
                     }
                 },
-                "256": {
+                "249": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.assert_only_self"
+                        "openzeppelin.account.library.Account.is_valid_signature"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 34,
-                        "end_line": 73,
+                        "end_col": 57,
+                        "end_line": 10,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/signature.cairo"
                         },
-                        "start_col": 13,
-                        "start_line": 73
+                        "parent_location": [
+                            {
+                                "end_col": 10,
+                                "end_line": 135,
+                                "input_file": {
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                },
+                                "parent_location": [
+                                    {
+                                        "end_col": 37,
+                                        "end_line": 122,
+                                        "input_file": {
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                        },
+                                        "parent_location": [
+                                            {
+                                                "end_col": 32,
+                                                "end_line": 137,
+                                                "input_file": {
+                                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                                },
+                                                "start_col": 9,
+                                                "start_line": 137
+                                            },
+                                            "While trying to retrieve the implicit argument 'ecdsa_ptr' in:"
+                                        ],
+                                        "start_col": 9,
+                                        "start_line": 122
+                                    },
+                                    "While expanding the reference 'ecdsa_ptr' in:"
+                                ],
+                                "start_col": 9,
+                                "start_line": 133
+                            },
+                            "While trying to update the implicit return value 'ecdsa_ptr' in:"
+                        ],
+                        "start_col": 29,
+                        "start_line": 10
                     }
                 },
-                "257": {
+                "250": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.assert_only_self"
+                        "openzeppelin.account.library.Account.is_valid_signature"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 43,
-                        "end_line": 196,
+                        "end_col": 78,
+                        "end_line": 13,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "autogen/starknet/storage_var/Account_public_key/decl.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 44,
-                                "end_line": 71,
+                                "end_col": 54,
+                                "end_line": 125,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 45,
-                                        "end_line": 69,
+                                        "end_col": 24,
+                                        "end_line": 123,
                                         "input_file": {
-                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "parent_location": [
                                             {
-                                                "end_col": 19,
-                                                "end_line": 75,
+                                                "end_col": 32,
+                                                "end_line": 137,
                                                 "input_file": {
-                                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                                 },
                                                 "start_col": 9,
-                                                "start_line": 75
+                                                "start_line": 137
                                             },
-                                            "While trying to retrieve the implicit argument 'syscall_ptr' in:"
+                                            "While trying to retrieve the implicit argument 'range_check_ptr' in:"
                                         ],
-                                        "start_col": 27,
-                                        "start_line": 69
+                                        "start_col": 9,
+                                        "start_line": 123
                                     },
-                                    "While expanding the reference 'syscall_ptr' in:"
+                                    "While expanding the reference 'range_check_ptr' in:"
                                 ],
-                                "start_col": 24,
-                                "start_line": 71
+                                "start_col": 29,
+                                "start_line": 125
                             },
-                            "While trying to update the implicit return value 'syscall_ptr' in:"
+                            "While trying to update the implicit return value 'range_check_ptr' in:"
                         ],
-                        "start_col": 25,
-                        "start_line": 196
+                        "start_col": 63,
+                        "start_line": 13
                     }
                 },
-                "258": {
+                "251": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.assert_only_self"
+                        "openzeppelin.account.library.Account.is_valid_signature"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 19,
-                        "end_line": 75,
+                        "end_col": 30,
+                        "end_line": 137,
+                        "input_file": {
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                        },
+                        "start_col": 26,
+                        "start_line": 137
+                    }
+                },
+                "253": {
+                    "accessible_scopes": [
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account.is_valid_signature"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 32,
+                        "end_line": 137,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 9,
-                        "start_line": 75
+                        "start_line": 137
                     }
                 },
-                "259": {
+                "254": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.get_public_key"
+                        "openzeppelin.account.library.Account.execute"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 43,
-                        "end_line": 82,
+                        "end_col": 22,
+                        "end_line": 180,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "parent_location": [
-                            {
-                                "end_col": 33,
-                                "end_line": 13,
-                                "input_file": {
-                                    "filename": "autogen/starknet/storage_var/Account_public_key/decl.cairo"
-                                },
-                                "parent_location": [
-                                    {
-                                        "end_col": 41,
-                                        "end_line": 85,
-                                        "input_file": {
-                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                                        },
-                                        "start_col": 16,
-                                        "start_line": 85
-                                    },
-                                    "While trying to retrieve the implicit argument 'syscall_ptr' in:"
-                                ],
-                                "start_col": 15,
-                                "start_line": 13
-                            },
-                            "While expanding the reference 'syscall_ptr' in:"
-                        ],
-                        "start_col": 25,
-                        "start_line": 82
+                        "start_col": 9,
+                        "start_line": 180
                     }
                 },
-                "260": {
+                "256": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.get_public_key"
+                        "openzeppelin.account.library.Account.execute"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 71,
-                        "end_line": 82,
+                        "end_col": 27,
+                        "end_line": 172,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 61,
-                                "end_line": 13,
+                                "end_col": 36,
+                                "end_line": 438,
                                 "input_file": {
-                                    "filename": "autogen/starknet/storage_var/Account_public_key/decl.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 41,
-                                        "end_line": 85,
+                                        "end_col": 38,
+                                        "end_line": 182,
                                         "input_file": {
-                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
-                                        "start_col": 16,
-                                        "start_line": 85
+                                        "start_col": 25,
+                                        "start_line": 182
                                     },
-                                    "While trying to retrieve the implicit argument 'pedersen_ptr' in:"
+                                    "While trying to retrieve the implicit argument 'syscall_ptr' in:"
                                 ],
-                                "start_col": 35,
-                                "start_line": 13
+                                "start_col": 18,
+                                "start_line": 438
                             },
-                            "While expanding the reference 'pedersen_ptr' in:"
+                            "While expanding the reference 'syscall_ptr' in:"
                         ],
-                        "start_col": 45,
-                        "start_line": 82
+                        "start_col": 9,
+                        "start_line": 172
                     }
                 },
-                "261": {
+                "257": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.get_public_key"
+                        "openzeppelin.account.library.Account.execute"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 88,
-                        "end_line": 82,
+                        "end_col": 38,
+                        "end_line": 182,
+                        "input_file": {
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                        },
+                        "start_col": 25,
+                        "start_line": 182
+                    }
+                },
+                "259": {
+                    "accessible_scopes": [
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account.execute"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 24,
+                        "end_line": 176,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 78,
-                                "end_line": 13,
+                                "end_col": 32,
+                                "end_line": 79,
                                 "input_file": {
-                                    "filename": "autogen/starknet/storage_var/Account_public_key/decl.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 41,
-                                        "end_line": 85,
+                                        "end_col": 68,
+                                        "end_line": 185,
                                         "input_file": {
-                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
-                                        "start_col": 16,
-                                        "start_line": 85
+                                        "start_col": 20,
+                                        "start_line": 185
                                     },
                                     "While trying to retrieve the implicit argument 'range_check_ptr' in:"
                                 ],
-                                "start_col": 63,
-                                "start_line": 13
+                                "start_col": 17,
+                                "start_line": 79
                             },
                             "While expanding the reference 'range_check_ptr' in:"
                         ],
-                        "start_col": 73,
-                        "start_line": 82
+                        "start_col": 9,
+                        "start_line": 176
+                    }
+                },
+                "260": {
+                    "accessible_scopes": [
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account.execute"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 50,
+                        "end_line": 185,
+                        "input_file": {
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                        },
+                        "start_col": 31,
+                        "start_line": 185
                     }
                 },
                 "262": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.get_public_key"
+                        "openzeppelin.account.library.Account.execute"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 41,
-                        "end_line": 85,
+                        "end_col": 67,
+                        "end_line": 185,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "start_col": 16,
-                        "start_line": 85
+                        "start_col": 52,
+                        "start_line": 185
                     }
                 },
-                "264": {
+                "263": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.get_public_key"
+                        "openzeppelin.account.library.Account.execute"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 42,
-                        "end_line": 85,
+                        "end_col": 68,
+                        "end_line": 185,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "start_col": 9,
-                        "start_line": 85
+                        "start_col": 20,
+                        "start_line": 185
                     }
                 },
                 "265": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.set_public_key"
+                        "openzeppelin.account.library.Account.execute"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 43,
-                        "end_line": 92,
+                        "end_col": 75,
+                        "end_line": 185,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "parent_location": [
-                            {
-                                "end_col": 45,
-                                "end_line": 69,
-                                "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                                },
-                                "parent_location": [
-                                    {
-                                        "end_col": 27,
-                                        "end_line": 95,
-                                        "input_file": {
-                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                                        },
-                                        "start_col": 9,
-                                        "start_line": 95
-                                    },
-                                    "While trying to retrieve the implicit argument 'syscall_ptr' in:"
-                                ],
-                                "start_col": 27,
-                                "start_line": 69
-                            },
-                            "While expanding the reference 'syscall_ptr' in:"
-                        ],
-                        "start_col": 25,
-                        "start_line": 92
+                        "start_col": 71,
+                        "start_line": 185
                     }
                 },
-                "266": {
+                "267": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.set_public_key"
+                        "openzeppelin.account.library.Account.execute"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 27,
-                        "end_line": 95,
+                        "end_col": 76,
+                        "end_line": 185,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "start_col": 9,
-                        "start_line": 95
+                        "start_col": 13,
+                        "start_line": 185
                     }
                 },
                 "268": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.set_public_key"
+                        "openzeppelin.account.library.Account.execute"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 71,
-                        "end_line": 92,
+                        "end_col": 32,
+                        "end_line": 79,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 62,
-                                "end_line": 21,
+                                "end_col": 68,
+                                "end_line": 185,
                                 "input_file": {
-                                    "filename": "autogen/starknet/storage_var/Account_public_key/decl.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 49,
-                                        "end_line": 96,
+                                        "end_col": 32,
+                                        "end_line": 79,
                                         "input_file": {
-                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
                                         },
-                                        "start_col": 9,
-                                        "start_line": 96
+                                        "parent_location": [
+                                            {
+                                                "end_col": 68,
+                                                "end_line": 185,
+                                                "input_file": {
+                                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                                },
+                                                "start_col": 20,
+                                                "start_line": 185
+                                            },
+                                            "While trying to update the implicit return value 'range_check_ptr' in:"
+                                        ],
+                                        "start_col": 17,
+                                        "start_line": 79
                                     },
-                                    "While trying to retrieve the implicit argument 'pedersen_ptr' in:"
+                                    "While auto generating local variable for 'range_check_ptr'."
                                 ],
-                                "start_col": 36,
-                                "start_line": 21
+                                "start_col": 20,
+                                "start_line": 185
                             },
-                            "While expanding the reference 'pedersen_ptr' in:"
+                            "While trying to update the implicit return value 'range_check_ptr' in:"
                         ],
-                        "start_col": 45,
-                        "start_line": 92
+                        "start_col": 17,
+                        "start_line": 79
                     }
                 },
                 "269": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.set_public_key"
+                        "openzeppelin.account.library.Account.execute"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 88,
-                        "end_line": 92,
+                        "end_col": 36,
+                        "end_line": 438,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 79,
-                                "end_line": 21,
+                                "end_col": 38,
+                                "end_line": 182,
                                 "input_file": {
-                                    "filename": "autogen/starknet/storage_var/Account_public_key/decl.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 49,
-                                        "end_line": 96,
+                                        "end_col": 43,
+                                        "end_line": 196,
                                         "input_file": {
-                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                                         },
-                                        "start_col": 9,
-                                        "start_line": 96
+                                        "parent_location": [
+                                            {
+                                                "end_col": 44,
+                                                "end_line": 189,
+                                                "input_file": {
+                                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                                },
+                                                "start_col": 24,
+                                                "start_line": 189
+                                            },
+                                            "While trying to retrieve the implicit argument 'syscall_ptr' in:"
+                                        ],
+                                        "start_col": 25,
+                                        "start_line": 196
                                     },
-                                    "While trying to retrieve the implicit argument 'range_check_ptr' in:"
+                                    "While expanding the reference 'syscall_ptr' in:"
                                 ],
-                                "start_col": 64,
-                                "start_line": 21
+                                "start_col": 25,
+                                "start_line": 182
                             },
-                            "While expanding the reference 'range_check_ptr' in:"
+                            "While trying to update the implicit return value 'syscall_ptr' in:"
                         ],
-                        "start_col": 73,
-                        "start_line": 92
+                        "start_col": 18,
+                        "start_line": 438
                     }
                 },
                 "270": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.set_public_key"
+                        "openzeppelin.account.library.Account.execute"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 29,
-                        "end_line": 93,
+                        "end_col": 44,
+                        "end_line": 189,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "parent_location": [
-                            {
-                                "end_col": 48,
-                                "end_line": 96,
-                                "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                                },
-                                "start_col": 34,
-                                "start_line": 96
-                            },
-                            "While expanding the reference 'new_public_key' in:"
-                        ],
-                        "start_col": 9,
-                        "start_line": 93
+                        "start_col": 24,
+                        "start_line": 189
                     }
                 },
-                "271": {
+                "272": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.set_public_key"
+                        "openzeppelin.account.library.Account.execute"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 49,
-                        "end_line": 96,
+                        "end_col": 31,
+                        "end_line": 191,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "start_col": 9,
-                        "start_line": 96
+                        "start_col": 13,
+                        "start_line": 191
                     }
                 },
-                "273": {
+                "274": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.set_public_key"
+                        "openzeppelin.account.library.Account.execute"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 19,
-                        "end_line": 97,
+                        "end_col": 37,
+                        "end_line": 195,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "start_col": 9,
-                        "start_line": 97
+                        "start_col": 30,
+                        "start_line": 195
                     }
                 },
-                "274": {
+                "276": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.is_valid_signature"
+                        "openzeppelin.account.library.Account.execute"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 27,
-                        "end_line": 105,
+                        "end_col": 26,
+                        "end_line": 195,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 33,
-                                "end_line": 13,
+                                "end_col": 26,
+                                "end_line": 195,
                                 "input_file": {
-                                    "filename": "autogen/starknet/storage_var/Account_public_key/decl.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
-                                "parent_location": [
-                                    {
-                                        "end_col": 54,
-                                        "end_line": 110,
-                                        "input_file": {
-                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                                        },
-                                        "start_col": 29,
-                                        "start_line": 110
-                                    },
-                                    "While trying to retrieve the implicit argument 'syscall_ptr' in:"
-                                ],
-                                "start_col": 15,
-                                "start_line": 13
+                                "start_col": 14,
+                                "start_line": 195
                             },
-                            "While expanding the reference 'syscall_ptr' in:"
+                            "While auto generating local variable for 'calls'."
                         ],
-                        "start_col": 9,
-                        "start_line": 105
+                        "start_col": 14,
+                        "start_line": 195
                     }
                 },
-                "275": {
+                "277": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.is_valid_signature"
+                        "openzeppelin.account.library.Account.execute"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 35,
-                        "end_line": 106,
+                        "end_col": 43,
+                        "end_line": 196,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 61,
-                                "end_line": 13,
+                                "end_col": 44,
+                                "end_line": 189,
                                 "input_file": {
-                                    "filename": "autogen/starknet/storage_var/Account_public_key/decl.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 54,
-                                        "end_line": 110,
+                                        "end_col": 53,
+                                        "end_line": 233,
                                         "input_file": {
-                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
-                                        "start_col": 29,
-                                        "start_line": 110
+                                        "parent_location": [
+                                            {
+                                                "end_col": 78,
+                                                "end_line": 196,
+                                                "input_file": {
+                                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                                },
+                                                "start_col": 9,
+                                                "start_line": 196
+                                            },
+                                            "While trying to retrieve the implicit argument 'syscall_ptr' in:"
+                                        ],
+                                        "start_col": 35,
+                                        "start_line": 233
                                     },
-                                    "While trying to retrieve the implicit argument 'pedersen_ptr' in:"
+                                    "While expanding the reference 'syscall_ptr' in:"
                                 ],
-                                "start_col": 35,
-                                "start_line": 13
+                                "start_col": 24,
+                                "start_line": 189
                             },
-                            "While expanding the reference 'pedersen_ptr' in:"
+                            "While trying to update the implicit return value 'syscall_ptr' in:"
                         ],
-                        "start_col": 9,
-                        "start_line": 106
+                        "start_col": 25,
+                        "start_line": 196
                     }
                 },
-                "276": {
+                "278": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.is_valid_signature"
+                        "openzeppelin.account.library.Account.execute"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 24,
-                        "end_line": 107,
+                        "end_col": 27,
+                        "end_line": 177,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 78,
-                                "end_line": 13,
+                                "end_col": 48,
+                                "end_line": 196,
                                 "input_file": {
-                                    "filename": "autogen/starknet/storage_var/Account_public_key/decl.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
-                                "parent_location": [
-                                    {
-                                        "end_col": 54,
-                                        "end_line": 110,
-                                        "input_file": {
-                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                                        },
-                                        "start_col": 29,
-                                        "start_line": 110
-                                    },
-                                    "While trying to retrieve the implicit argument 'range_check_ptr' in:"
-                                ],
-                                "start_col": 63,
-                                "start_line": 13
+                                "start_col": 34,
+                                "start_line": 196
                             },
-                            "While expanding the reference 'range_check_ptr' in:"
+                            "While expanding the reference 'call_array_len' in:"
                         ],
-                        "start_col": 9,
-                        "start_line": 107
-                    }
-                },
-                "277": {
-                    "accessible_scopes": [
-                        "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.is_valid_signature"
-                    ],
-                    "flow_tracking_data": null,
-                    "hints": [],
-                    "inst": {
-                        "end_col": 54,
-                        "end_line": 110,
-                        "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                        },
-                        "start_col": 29,
-                        "start_line": 110
+                        "start_col": 7,
+                        "start_line": 177
                     }
                 },
                 "279": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.is_valid_signature"
+                        "openzeppelin.account.library.Account.execute"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 37,
-                        "end_line": 108,
+                        "end_col": 58,
+                        "end_line": 177,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 57,
-                                "end_line": 10,
+                                "end_col": 60,
+                                "end_line": 196,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/signature.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
-                                "parent_location": [
-                                    {
-                                        "end_col": 10,
-                                        "end_line": 120,
-                                        "input_file": {
-                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                                        },
-                                        "start_col": 9,
-                                        "start_line": 118
-                                    },
-                                    "While trying to retrieve the implicit argument 'ecdsa_ptr' in:"
-                                ],
-                                "start_col": 29,
-                                "start_line": 10
+                                "start_col": 50,
+                                "start_line": 196
                             },
-                            "While expanding the reference 'ecdsa_ptr' in:"
+                            "While expanding the reference 'call_array' in:"
                         ],
-                        "start_col": 9,
-                        "start_line": 108
+                        "start_col": 29,
+                        "start_line": 177
                     }
                 },
                 "280": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.is_valid_signature"
+                        "openzeppelin.account.library.Account.execute"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 17,
-                        "end_line": 109,
+                        "end_col": 95,
+                        "end_line": 177,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 25,
-                                "end_line": 119,
+                                "end_col": 70,
+                                "end_line": 196,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
-                                "start_col": 21,
-                                "start_line": 119
+                                "start_col": 62,
+                                "start_line": 196
                             },
-                            "While expanding the reference 'hash' in:"
+                            "While expanding the reference 'calldata' in:"
                         ],
-                        "start_col": 7,
-                        "start_line": 109
+                        "start_col": 80,
+                        "start_line": 177
                     }
                 },
                 "281": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.is_valid_signature"
+                        "openzeppelin.account.library.Account.execute"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 25,
-                        "end_line": 110,
+                        "end_col": 26,
+                        "end_line": 195,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 49,
-                                "end_line": 119,
+                                "end_col": 26,
+                                "end_line": 195,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
-                                "start_col": 38,
-                                "start_line": 119
+                                "parent_location": [
+                                    {
+                                        "end_col": 77,
+                                        "end_line": 196,
+                                        "input_file": {
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                        },
+                                        "start_col": 72,
+                                        "start_line": 196
+                                    },
+                                    "While expanding the reference 'calls' in:"
+                                ],
+                                "start_col": 14,
+                                "start_line": 195
                             },
-                            "While expanding the reference '_public_key' in:"
+                            "While auto generating local variable for 'calls'."
                         ],
                         "start_col": 14,
-                        "start_line": 110
+                        "start_line": 195
                     }
                 },
                 "282": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.is_valid_signature"
+                        "openzeppelin.account.library.Account.execute"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 33,
-                        "end_line": 115,
+                        "end_col": 78,
+                        "end_line": 196,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "parent_location": [
-                            {
-                                "end_col": 68,
-                                "end_line": 119,
-                                "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                                },
-                                "start_col": 63,
-                                "start_line": 119
-                            },
-                            "While expanding the reference 'sig_r' in:"
-                        ],
-                        "start_col": 21,
-                        "start_line": 115
+                        "start_col": 9,
+                        "start_line": 196
                     }
                 },
-                "283": {
+                "284": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.is_valid_signature"
+                        "openzeppelin.account.library.Account.execute"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 33,
-                        "end_line": 116,
+                        "end_col": 40,
+                        "end_line": 200,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "parent_location": [
-                            {
-                                "end_col": 87,
-                                "end_line": 119,
-                                "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                                },
-                                "start_col": 82,
-                                "start_line": 119
-                            },
-                            "While expanding the reference 'sig_s' in:"
-                        ],
-                        "start_col": 21,
-                        "start_line": 116
+                        "start_col": 33,
+                        "start_line": 200
                     }
                 },
-                "284": {
+                "286": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.is_valid_signature"
+                        "openzeppelin.account.library.Account.execute"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 10,
-                        "end_line": 120,
+                        "end_col": 29,
+                        "end_line": 200,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "start_col": 9,
-                        "start_line": 118
+                        "parent_location": [
+                            {
+                                "end_col": 29,
+                                "end_line": 200,
+                                "input_file": {
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                },
+                                "start_col": 14,
+                                "start_line": 200
+                            },
+                            "While auto generating local variable for 'response'."
+                        ],
+                        "start_col": 14,
+                        "start_line": 200
                     }
                 },
-                "286": {
+                "287": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.is_valid_signature"
+                        "openzeppelin.account.library.Account.execute"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 33,
-                        "end_line": 13,
+                        "end_col": 53,
+                        "end_line": 233,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/Account_public_key/decl.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 54,
-                                "end_line": 110,
+                                "end_col": 78,
+                                "end_line": 196,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 27,
-                                        "end_line": 105,
+                                        "end_col": 42,
+                                        "end_line": 206,
                                         "input_file": {
-                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "parent_location": [
                                             {
-                                                "end_col": 32,
-                                                "end_line": 122,
+                                                "end_col": 71,
+                                                "end_line": 201,
                                                 "input_file": {
-                                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                                 },
-                                                "start_col": 9,
-                                                "start_line": 122
+                                                "start_col": 30,
+                                                "start_line": 201
                                             },
                                             "While trying to retrieve the implicit argument 'syscall_ptr' in:"
                                         ],
-                                        "start_col": 9,
-                                        "start_line": 105
+                                        "start_col": 24,
+                                        "start_line": 206
                                     },
                                     "While expanding the reference 'syscall_ptr' in:"
                                 ],
-                                "start_col": 29,
-                                "start_line": 110
+                                "start_col": 9,
+                                "start_line": 196
                             },
                             "While trying to update the implicit return value 'syscall_ptr' in:"
                         ],
-                        "start_col": 15,
-                        "start_line": 13
+                        "start_col": 35,
+                        "start_line": 233
                     }
                 },
-                "287": {
+                "288": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.is_valid_signature"
+                        "openzeppelin.account.library.Account.execute"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 61,
-                        "end_line": 13,
+                        "end_col": 27,
+                        "end_line": 177,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/Account_public_key/decl.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 54,
-                                "end_line": 110,
+                                "end_col": 39,
+                                "end_line": 197,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 35,
-                                        "end_line": 106,
+                                        "end_col": 53,
+                                        "end_line": 201,
                                         "input_file": {
-                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
-                                        "parent_location": [
-                                            {
-                                                "end_col": 32,
-                                                "end_line": 122,
-                                                "input_file": {
-                                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                                                },
-                                                "start_col": 9,
-                                                "start_line": 122
-                                            },
-                                            "While trying to retrieve the implicit argument 'pedersen_ptr' in:"
-                                        ],
-                                        "start_col": 9,
-                                        "start_line": 106
+                                        "start_col": 44,
+                                        "start_line": 201
                                     },
-                                    "While expanding the reference 'pedersen_ptr' in:"
+                                    "While expanding the reference 'calls_len' in:"
                                 ],
-                                "start_col": 29,
-                                "start_line": 110
+                                "start_col": 25,
+                                "start_line": 197
                             },
-                            "While trying to update the implicit return value 'pedersen_ptr' in:"
+                            "While expanding the reference 'call_array_len' in:"
                         ],
-                        "start_col": 35,
-                        "start_line": 13
+                        "start_col": 7,
+                        "start_line": 177
                     }
                 },
-                "288": {
+                "289": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.is_valid_signature"
+                        "openzeppelin.account.library.Account.execute"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 78,
-                        "end_line": 13,
+                        "end_col": 26,
+                        "end_line": 195,
                         "input_file": {
-                            "filename": "autogen/starknet/storage_var/Account_public_key/decl.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 54,
-                                "end_line": 110,
+                                "end_col": 26,
+                                "end_line": 195,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 24,
-                                        "end_line": 107,
+                                        "end_col": 60,
+                                        "end_line": 201,
                                         "input_file": {
-                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
-                                        "parent_location": [
-                                            {
-                                                "end_col": 32,
-                                                "end_line": 122,
-                                                "input_file": {
-                                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                                                },
-                                                "start_col": 9,
-                                                "start_line": 122
-                                            },
-                                            "While trying to retrieve the implicit argument 'range_check_ptr' in:"
-                                        ],
-                                        "start_col": 9,
-                                        "start_line": 107
+                                        "start_col": 55,
+                                        "start_line": 201
                                     },
-                                    "While expanding the reference 'range_check_ptr' in:"
+                                    "While expanding the reference 'calls' in:"
                                 ],
-                                "start_col": 29,
-                                "start_line": 110
+                                "start_col": 14,
+                                "start_line": 195
                             },
-                            "While trying to update the implicit return value 'range_check_ptr' in:"
+                            "While auto generating local variable for 'calls'."
                         ],
-                        "start_col": 63,
-                        "start_line": 13
+                        "start_col": 14,
+                        "start_line": 195
                     }
                 },
-                "289": {
+                "290": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.is_valid_signature"
+                        "openzeppelin.account.library.Account.execute"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 57,
-                        "end_line": 10,
+                        "end_col": 29,
+                        "end_line": 200,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/signature.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 10,
-                                "end_line": 120,
+                                "end_col": 29,
+                                "end_line": 200,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 37,
-                                        "end_line": 108,
+                                        "end_col": 70,
+                                        "end_line": 201,
                                         "input_file": {
-                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
-                                        "parent_location": [
-                                            {
-                                                "end_col": 32,
-                                                "end_line": 122,
-                                                "input_file": {
-                                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                                                },
-                                                "start_col": 9,
-                                                "start_line": 122
-                                            },
-                                            "While trying to retrieve the implicit argument 'ecdsa_ptr' in:"
-                                        ],
-                                        "start_col": 9,
-                                        "start_line": 108
+                                        "start_col": 62,
+                                        "start_line": 201
                                     },
-                                    "While expanding the reference 'ecdsa_ptr' in:"
+                                    "While expanding the reference 'response' in:"
                                 ],
-                                "start_col": 9,
-                                "start_line": 118
+                                "start_col": 14,
+                                "start_line": 200
                             },
-                            "While trying to update the implicit return value 'ecdsa_ptr' in:"
+                            "While auto generating local variable for 'response'."
                         ],
-                        "start_col": 29,
-                        "start_line": 10
+                        "start_col": 14,
+                        "start_line": 200
                     }
                 },
-                "290": {
+                "291": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.is_valid_signature"
+                        "openzeppelin.account.library.Account.execute"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 30,
-                        "end_line": 122,
+                        "end_col": 71,
+                        "end_line": 201,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "start_col": 26,
-                        "start_line": 122
+                        "start_col": 30,
+                        "start_line": 201
                     }
                 },
-                "292": {
+                "293": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.is_valid_signature"
+                        "openzeppelin.account.library.Account.execute"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 32,
-                        "end_line": 122,
+                        "end_col": 42,
+                        "end_line": 206,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "start_col": 9,
-                        "start_line": 122
+                        "parent_location": [
+                            {
+                                "end_col": 71,
+                                "end_line": 201,
+                                "input_file": {
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                },
+                                "parent_location": [
+                                    {
+                                        "end_col": 27,
+                                        "end_line": 172,
+                                        "input_file": {
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                        },
+                                        "parent_location": [
+                                            {
+                                                "end_col": 63,
+                                                "end_line": 203,
+                                                "input_file": {
+                                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                                },
+                                                "start_col": 9,
+                                                "start_line": 203
+                                            },
+                                            "While trying to retrieve the implicit argument 'syscall_ptr' in:"
+                                        ],
+                                        "start_col": 9,
+                                        "start_line": 172
+                                    },
+                                    "While expanding the reference 'syscall_ptr' in:"
+                                ],
+                                "start_col": 30,
+                                "start_line": 201
+                            },
+                            "While trying to update the implicit return value 'syscall_ptr' in:"
+                        ],
+                        "start_col": 24,
+                        "start_line": 206
                     }
                 },
-                "293": {
+                "294": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
@@ -7436,13 +7236,37 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 22,
-                        "end_line": 165,
+                        "end_col": 35,
+                        "end_line": 173,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
+                        "parent_location": [
+                            {
+                                "end_col": 35,
+                                "end_line": 173,
+                                "input_file": {
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                },
+                                "parent_location": [
+                                    {
+                                        "end_col": 63,
+                                        "end_line": 203,
+                                        "input_file": {
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                        },
+                                        "start_col": 9,
+                                        "start_line": 203
+                                    },
+                                    "While trying to retrieve the implicit argument 'pedersen_ptr' in:"
+                                ],
+                                "start_col": 9,
+                                "start_line": 173
+                            },
+                            "While expanding the reference 'pedersen_ptr' in:"
+                        ],
                         "start_col": 9,
-                        "start_line": 165
+                        "start_line": 173
                     }
                 },
                 "295": {
@@ -7454,37 +7278,37 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 27,
-                        "end_line": 157,
+                        "end_col": 37,
+                        "end_line": 174,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 36,
-                                "end_line": 438,
+                                "end_col": 37,
+                                "end_line": 174,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 38,
-                                        "end_line": 168,
+                                        "end_col": 63,
+                                        "end_line": 203,
                                         "input_file": {
-                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
-                                        "start_col": 25,
-                                        "start_line": 168
+                                        "start_col": 9,
+                                        "start_line": 203
                                     },
-                                    "While trying to retrieve the implicit argument 'syscall_ptr' in:"
+                                    "While trying to retrieve the implicit argument 'ecdsa_ptr' in:"
                                 ],
-                                "start_col": 18,
-                                "start_line": 438
+                                "start_col": 9,
+                                "start_line": 174
                             },
-                            "While expanding the reference 'syscall_ptr' in:"
+                            "While expanding the reference 'ecdsa_ptr' in:"
                         ],
                         "start_col": 9,
-                        "start_line": 157
+                        "start_line": 174
                     }
                 },
                 "296": {
@@ -7496,34 +7320,40 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 38,
-                        "end_line": 168,
-                        "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                        },
-                        "start_col": 25,
-                        "start_line": 168
-                    }
-                },
-                "298": {
-                    "accessible_scopes": [
-                        "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.execute"
-                    ],
-                    "flow_tracking_data": null,
-                    "hints": [],
-                    "inst": {
-                        "end_col": 39,
-                        "end_line": 170,
+                        "end_col": 37,
+                        "end_line": 175,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "start_col": 38,
-                        "start_line": 170
+                        "parent_location": [
+                            {
+                                "end_col": 37,
+                                "end_line": 175,
+                                "input_file": {
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                },
+                                "parent_location": [
+                                    {
+                                        "end_col": 63,
+                                        "end_line": 203,
+                                        "input_file": {
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                        },
+                                        "start_col": 9,
+                                        "start_line": 203
+                                    },
+                                    "While trying to retrieve the implicit argument 'bitwise_ptr' in:"
+                                ],
+                                "start_col": 9,
+                                "start_line": 175
+                            },
+                            "While expanding the reference 'bitwise_ptr' in:"
+                        ],
+                        "start_col": 9,
+                        "start_line": 175
                     }
                 },
-                "300": {
+                "297": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
@@ -7532,124 +7362,76 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 40,
-                        "end_line": 170,
+                        "end_col": 32,
+                        "end_line": 79,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                        },
-                        "start_col": 13,
-                        "start_line": 170
-                    }
-                },
-                "301": {
-                    "accessible_scopes": [
-                        "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.execute"
-                    ],
-                    "flow_tracking_data": null,
-                    "hints": [],
-                    "inst": {
-                        "end_col": 36,
-                        "end_line": 438,
-                        "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 38,
-                                "end_line": 168,
+                                "end_col": 68,
+                                "end_line": 185,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 43,
-                                        "end_line": 196,
+                                        "end_col": 32,
+                                        "end_line": 79,
                                         "input_file": {
-                                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
                                         },
                                         "parent_location": [
                                             {
-                                                "end_col": 44,
-                                                "end_line": 174,
+                                                "end_col": 68,
+                                                "end_line": 185,
                                                 "input_file": {
-                                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                                 },
-                                                "start_col": 24,
-                                                "start_line": 174
+                                                "parent_location": [
+                                                    {
+                                                        "end_col": 24,
+                                                        "end_line": 176,
+                                                        "input_file": {
+                                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                                        },
+                                                        "parent_location": [
+                                                            {
+                                                                "end_col": 63,
+                                                                "end_line": 203,
+                                                                "input_file": {
+                                                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                                                },
+                                                                "start_col": 9,
+                                                                "start_line": 203
+                                                            },
+                                                            "While trying to retrieve the implicit argument 'range_check_ptr' in:"
+                                                        ],
+                                                        "start_col": 9,
+                                                        "start_line": 176
+                                                    },
+                                                    "While expanding the reference 'range_check_ptr' in:"
+                                                ],
+                                                "start_col": 20,
+                                                "start_line": 185
                                             },
-                                            "While trying to retrieve the implicit argument 'syscall_ptr' in:"
+                                            "While trying to update the implicit return value 'range_check_ptr' in:"
                                         ],
-                                        "start_col": 25,
-                                        "start_line": 196
+                                        "start_col": 17,
+                                        "start_line": 79
                                     },
-                                    "While expanding the reference 'syscall_ptr' in:"
+                                    "While auto generating local variable for 'range_check_ptr'."
                                 ],
-                                "start_col": 25,
-                                "start_line": 168
+                                "start_col": 20,
+                                "start_line": 185
                             },
-                            "While trying to update the implicit return value 'syscall_ptr' in:"
+                            "While trying to update the implicit return value 'range_check_ptr' in:"
                         ],
-                        "start_col": 18,
-                        "start_line": 438
-                    }
-                },
-                "302": {
-                    "accessible_scopes": [
-                        "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.execute"
-                    ],
-                    "flow_tracking_data": null,
-                    "hints": [],
-                    "inst": {
-                        "end_col": 44,
-                        "end_line": 174,
-                        "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                        },
-                        "start_col": 24,
-                        "start_line": 174
-                    }
-                },
-                "304": {
-                    "accessible_scopes": [
-                        "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.execute"
-                    ],
-                    "flow_tracking_data": null,
-                    "hints": [],
-                    "inst": {
-                        "end_col": 31,
-                        "end_line": 176,
-                        "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                        },
-                        "start_col": 13,
-                        "start_line": 176
-                    }
-                },
-                "306": {
-                    "accessible_scopes": [
-                        "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.execute"
-                    ],
-                    "flow_tracking_data": null,
-                    "hints": [],
-                    "inst": {
-                        "end_col": 37,
-                        "end_line": 180,
-                        "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                        },
-                        "start_col": 30,
-                        "start_line": 180
+                        "start_col": 17,
+                        "start_line": 79
                     }
                 },
-                "308": {
+                "298": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
@@ -7659,27 +7441,27 @@
                     "hints": [],
                     "inst": {
                         "end_col": 26,
-                        "end_line": 180,
+                        "end_line": 201,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 26,
-                                "end_line": 180,
+                                "end_col": 42,
+                                "end_line": 203,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
-                                "start_col": 14,
-                                "start_line": 180
+                                "start_col": 30,
+                                "start_line": 203
                             },
-                            "While auto generating local variable for 'calls'."
+                            "While expanding the reference 'response_len' in:"
                         ],
                         "start_col": 14,
-                        "start_line": 180
+                        "start_line": 201
                     }
                 },
-                "309": {
+                "299": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
@@ -7688,52 +7470,40 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 43,
-                        "end_line": 196,
+                        "end_col": 29,
+                        "end_line": 200,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 44,
-                                "end_line": 174,
+                                "end_col": 29,
+                                "end_line": 200,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 53,
-                                        "end_line": 218,
+                                        "end_col": 61,
+                                        "end_line": 203,
                                         "input_file": {
-                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
-                                        "parent_location": [
-                                            {
-                                                "end_col": 78,
-                                                "end_line": 181,
-                                                "input_file": {
-                                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                                                },
-                                                "start_col": 9,
-                                                "start_line": 181
-                                            },
-                                            "While trying to retrieve the implicit argument 'syscall_ptr' in:"
-                                        ],
-                                        "start_col": 35,
-                                        "start_line": 218
+                                        "start_col": 53,
+                                        "start_line": 203
                                     },
-                                    "While expanding the reference 'syscall_ptr' in:"
+                                    "While expanding the reference 'response' in:"
                                 ],
-                                "start_col": 24,
-                                "start_line": 174
+                                "start_col": 14,
+                                "start_line": 200
                             },
-                            "While trying to update the implicit return value 'syscall_ptr' in:"
+                            "While auto generating local variable for 'response'."
                         ],
-                        "start_col": 25,
-                        "start_line": 196
+                        "start_col": 14,
+                        "start_line": 200
                     }
                 },
-                "310": {
+                "300": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
@@ -7742,706 +7512,556 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 27,
-                        "end_line": 162,
+                        "end_col": 63,
+                        "end_line": 203,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "parent_location": [
-                            {
-                                "end_col": 48,
-                                "end_line": 181,
-                                "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                                },
-                                "start_col": 34,
-                                "start_line": 181
-                            },
-                            "While expanding the reference 'call_array_len' in:"
-                        ],
-                        "start_col": 7,
-                        "start_line": 162
+                        "start_col": 9,
+                        "start_line": 203
                     }
                 },
-                "311": {
+                "301": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.execute"
+                        "openzeppelin.account.library.Account._execute_list"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 58,
-                        "end_line": 162,
+                        "end_col": 22,
+                        "end_line": 209,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "parent_location": [
-                            {
-                                "end_col": 60,
-                                "end_line": 181,
-                                "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                                },
-                                "start_col": 50,
-                                "start_line": 181
-                            },
-                            "While expanding the reference 'call_array' in:"
-                        ],
-                        "start_col": 29,
-                        "start_line": 162
+                        "start_col": 9,
+                        "start_line": 209
                     }
                 },
-                "312": {
+                "303": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.execute"
+                        "openzeppelin.account.library.Account._execute_list"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 95,
-                        "end_line": 162,
+                        "end_col": 11,
+                        "end_line": 212,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "parent_location": [
-                            {
-                                "end_col": 70,
-                                "end_line": 181,
-                                "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                                },
-                                "start_col": 62,
-                                "start_line": 181
-                            },
-                            "While expanding the reference 'calldata' in:"
-                        ],
-                        "start_col": 80,
-                        "start_line": 162
+                        "start_col": 9,
+                        "start_line": 212
                     }
                 },
-                "313": {
+                "305": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.execute"
+                        "openzeppelin.account.library.Account._execute_list"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 26,
-                        "end_line": 180,
+                        "end_col": 42,
+                        "end_line": 206,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 26,
-                                "end_line": 180,
+                                "end_col": 42,
+                                "end_line": 206,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 77,
-                                        "end_line": 181,
+                                        "end_col": 37,
+                                        "end_line": 213,
                                         "input_file": {
-                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
-                                        "start_col": 72,
-                                        "start_line": 181
+                                        "start_col": 13,
+                                        "start_line": 213
                                     },
-                                    "While expanding the reference 'calls' in:"
+                                    "While trying to retrieve the implicit argument 'syscall_ptr' in:"
                                 ],
-                                "start_col": 14,
-                                "start_line": 180
+                                "start_col": 24,
+                                "start_line": 206
                             },
-                            "While auto generating local variable for 'calls'."
+                            "While expanding the reference 'syscall_ptr' in:"
                         ],
-                        "start_col": 14,
-                        "start_line": 180
+                        "start_col": 24,
+                        "start_line": 206
                     }
                 },
-                "314": {
+                "306": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.execute"
+                        "openzeppelin.account.library.Account._execute_list"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 78,
-                        "end_line": 181,
+                        "end_col": 35,
+                        "end_line": 213,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "start_col": 9,
-                        "start_line": 181
+                        "start_col": 34,
+                        "start_line": 213
                     }
                 },
-                "316": {
+                "308": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.execute"
+                        "openzeppelin.account.library.Account._execute_list"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 40,
-                        "end_line": 185,
+                        "end_col": 37,
+                        "end_line": 213,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "start_col": 33,
-                        "start_line": 185
+                        "start_col": 13,
+                        "start_line": 213
                     }
                 },
-                "318": {
+                "309": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.execute"
+                        "openzeppelin.account.library.Account._execute_list"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 29,
-                        "end_line": 185,
+                        "end_col": 42,
+                        "end_line": 206,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 29,
-                                "end_line": 185,
+                                "end_col": 38,
+                                "end_line": 42,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                                 },
-                                "start_col": 14,
-                                "start_line": 185
-                            },
-                            "While auto generating local variable for 'response'."
+                                "parent_location": [
+                                    {
+                                        "end_col": 10,
+                                        "end_line": 223,
+                                        "input_file": {
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                        },
+                                        "start_col": 19,
+                                        "start_line": 218
+                                    },
+                                    "While trying to retrieve the implicit argument 'syscall_ptr' in:"
+                                ],
+                                "start_col": 20,
+                                "start_line": 42
+                            },
+                            "While expanding the reference 'syscall_ptr' in:"
                         ],
-                        "start_col": 14,
-                        "start_line": 185
+                        "start_col": 24,
+                        "start_line": 206
                     }
                 },
-                "319": {
+                "310": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.execute"
+                        "openzeppelin.account.library.Account._execute_list"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 53,
-                        "end_line": 218,
+                        "end_col": 42,
+                        "end_line": 219,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "parent_location": [
-                            {
-                                "end_col": 78,
-                                "end_line": 181,
-                                "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                                },
-                                "parent_location": [
-                                    {
-                                        "end_col": 42,
-                                        "end_line": 191,
-                                        "input_file": {
-                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                                        },
-                                        "parent_location": [
-                                            {
-                                                "end_col": 71,
-                                                "end_line": 186,
-                                                "input_file": {
-                                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                                                },
-                                                "start_col": 30,
-                                                "start_line": 186
-                                            },
-                                            "While trying to retrieve the implicit argument 'syscall_ptr' in:"
-                                        ],
-                                        "start_col": 24,
-                                        "start_line": 191
-                                    },
-                                    "While expanding the reference 'syscall_ptr' in:"
-                                ],
-                                "start_col": 9,
-                                "start_line": 181
-                            },
-                            "While trying to update the implicit return value 'syscall_ptr' in:"
-                        ],
-                        "start_col": 35,
-                        "start_line": 218
+                        "start_col": 30,
+                        "start_line": 219
                     }
                 },
-                "320": {
+                "311": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.execute"
+                        "openzeppelin.account.library.Account._execute_list"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 27,
-                        "end_line": 162,
+                        "end_col": 49,
+                        "end_line": 220,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "parent_location": [
-                            {
-                                "end_col": 39,
-                                "end_line": 182,
-                                "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                                },
-                                "parent_location": [
-                                    {
-                                        "end_col": 53,
-                                        "end_line": 186,
-                                        "input_file": {
-                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                                        },
-                                        "start_col": 44,
-                                        "start_line": 186
-                                    },
-                                    "While expanding the reference 'calls_len' in:"
-                                ],
-                                "start_col": 25,
-                                "start_line": 182
-                            },
-                            "While expanding the reference 'call_array_len' in:"
-                        ],
-                        "start_col": 7,
-                        "start_line": 162
+                        "start_col": 31,
+                        "start_line": 220
                     }
                 },
-                "321": {
+                "312": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.execute"
+                        "openzeppelin.account.library.Account._execute_list"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 26,
-                        "end_line": 180,
+                        "end_col": 49,
+                        "end_line": 221,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "parent_location": [
-                            {
-                                "end_col": 26,
-                                "end_line": 180,
-                                "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                                },
-                                "parent_location": [
-                                    {
-                                        "end_col": 60,
-                                        "end_line": 186,
-                                        "input_file": {
-                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                                        },
-                                        "start_col": 55,
-                                        "start_line": 186
-                                    },
-                                    "While expanding the reference 'calls' in:"
-                                ],
-                                "start_col": 14,
-                                "start_line": 180
-                            },
-                            "While auto generating local variable for 'calls'."
-                        ],
-                        "start_col": 14,
-                        "start_line": 180
+                        "start_col": 27,
+                        "start_line": 221
                     }
                 },
-                "322": {
+                "313": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.execute"
+                        "openzeppelin.account.library.Account._execute_list"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 29,
-                        "end_line": 185,
+                        "end_col": 40,
+                        "end_line": 222,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "parent_location": [
-                            {
-                                "end_col": 29,
-                                "end_line": 185,
-                                "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                                },
-                                "parent_location": [
-                                    {
-                                        "end_col": 70,
-                                        "end_line": 186,
-                                        "input_file": {
-                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                                        },
-                                        "start_col": 62,
-                                        "start_line": 186
-                                    },
-                                    "While expanding the reference 'response' in:"
-                                ],
-                                "start_col": 14,
-                                "start_line": 185
-                            },
-                            "While auto generating local variable for 'response'."
-                        ],
-                        "start_col": 14,
-                        "start_line": 185
+                        "start_col": 22,
+                        "start_line": 222
                     }
                 },
-                "323": {
+                "314": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.execute"
+                        "openzeppelin.account.library.Account._execute_list"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 71,
-                        "end_line": 186,
+                        "end_col": 10,
+                        "end_line": 223,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "start_col": 30,
-                        "start_line": 186
+                        "start_col": 19,
+                        "start_line": 218
                     }
                 },
-                "325": {
+                "316": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.execute"
+                        "openzeppelin.account.library.Account._execute_list"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 42,
-                        "end_line": 191,
+                        "end_col": 16,
+                        "end_line": 218,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 71,
-                                "end_line": 186,
+                                "end_col": 16,
+                                "end_line": 218,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
-                                "parent_location": [
-                                    {
-                                        "end_col": 27,
-                                        "end_line": 157,
-                                        "input_file": {
-                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                                        },
-                                        "parent_location": [
-                                            {
-                                                "end_col": 63,
-                                                "end_line": 188,
-                                                "input_file": {
-                                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                                                },
-                                                "start_col": 9,
-                                                "start_line": 188
-                                            },
-                                            "While trying to retrieve the implicit argument 'syscall_ptr' in:"
-                                        ],
-                                        "start_col": 9,
-                                        "start_line": 157
-                                    },
-                                    "While expanding the reference 'syscall_ptr' in:"
-                                ],
-                                "start_col": 30,
-                                "start_line": 186
+                                "start_col": 13,
+                                "start_line": 218
                             },
-                            "While trying to update the implicit return value 'syscall_ptr' in:"
+                            "While auto generating local variable for 'res'."
                         ],
-                        "start_col": 24,
-                        "start_line": 191
+                        "start_col": 13,
+                        "start_line": 218
                     }
                 },
-                "326": {
+                "317": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.execute"
+                        "openzeppelin.account.library.Account._execute_list"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 35,
-                        "end_line": 158,
+                        "end_col": 16,
+                        "end_line": 218,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 35,
-                                "end_line": 158,
+                                "end_col": 16,
+                                "end_line": 218,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
-                                "parent_location": [
-                                    {
-                                        "end_col": 63,
-                                        "end_line": 188,
-                                        "input_file": {
-                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                                        },
-                                        "start_col": 9,
-                                        "start_line": 188
-                                    },
-                                    "While trying to retrieve the implicit argument 'pedersen_ptr' in:"
-                                ],
-                                "start_col": 9,
-                                "start_line": 158
+                                "start_col": 13,
+                                "start_line": 218
                             },
-                            "While expanding the reference 'pedersen_ptr' in:"
+                            "While auto generating local variable for 'res'."
                         ],
-                        "start_col": 9,
-                        "start_line": 158
+                        "start_col": 13,
+                        "start_line": 218
                     }
                 },
-                "327": {
+                "318": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.execute"
+                        "openzeppelin.account.library.Account._execute_list"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 24,
-                        "end_line": 159,
+                        "end_col": 38,
+                        "end_line": 42,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 24,
-                                "end_line": 159,
+                                "end_col": 10,
+                                "end_line": 223,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 63,
-                                        "end_line": 188,
+                                        "end_col": 38,
+                                        "end_line": 42,
                                         "input_file": {
-                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                                         },
-                                        "start_col": 9,
-                                        "start_line": 188
+                                        "parent_location": [
+                                            {
+                                                "end_col": 10,
+                                                "end_line": 223,
+                                                "input_file": {
+                                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                                },
+                                                "start_col": 19,
+                                                "start_line": 218
+                                            },
+                                            "While trying to update the implicit return value 'syscall_ptr' in:"
+                                        ],
+                                        "start_col": 20,
+                                        "start_line": 42
                                     },
-                                    "While trying to retrieve the implicit argument 'range_check_ptr' in:"
+                                    "While auto generating local variable for 'syscall_ptr'."
                                 ],
-                                "start_col": 9,
-                                "start_line": 159
+                                "start_col": 19,
+                                "start_line": 218
                             },
-                            "While expanding the reference 'range_check_ptr' in:"
+                            "While trying to update the implicit return value 'syscall_ptr' in:"
                         ],
-                        "start_col": 9,
-                        "start_line": 159
+                        "start_col": 20,
+                        "start_line": 42
                     }
                 },
-                "328": {
+                "319": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.execute"
+                        "openzeppelin.account.library.Account._execute_list"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 37,
-                        "end_line": 160,
+                        "end_col": 90,
+                        "end_line": 206,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 37,
-                                "end_line": 160,
+                                "end_col": 24,
+                                "end_line": 225,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
-                                "parent_location": [
-                                    {
-                                        "end_col": 63,
-                                        "end_line": 188,
-                                        "input_file": {
-                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                                        },
-                                        "start_col": 9,
-                                        "start_line": 188
-                                    },
-                                    "While trying to retrieve the implicit argument 'ecdsa_ptr' in:"
-                                ],
-                                "start_col": 9,
-                                "start_line": 160
+                                "start_col": 16,
+                                "start_line": 225
                             },
-                            "While expanding the reference 'ecdsa_ptr' in:"
+                            "While expanding the reference 'response' in:"
                         ],
-                        "start_col": 9,
-                        "start_line": 160
+                        "start_col": 75,
+                        "start_line": 206
                     }
                 },
-                "329": {
+                "320": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.execute"
+                        "openzeppelin.account.library.Account._execute_list"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
                         "end_col": 37,
-                        "end_line": 161,
+                        "end_line": 225,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "parent_location": [
-                            {
-                                "end_col": 37,
-                                "end_line": 161,
-                                "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                                },
-                                "parent_location": [
-                                    {
-                                        "end_col": 63,
-                                        "end_line": 188,
-                                        "input_file": {
-                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                                        },
-                                        "start_col": 9,
-                                        "start_line": 188
-                                    },
-                                    "While trying to retrieve the implicit argument 'bitwise_ptr' in:"
-                                ],
-                                "start_col": 9,
-                                "start_line": 161
-                            },
-                            "While expanding the reference 'bitwise_ptr' in:"
-                        ],
-                        "start_col": 9,
-                        "start_line": 161
+                        "start_col": 26,
+                        "start_line": 225
                     }
                 },
-                "330": {
+                "321": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.execute"
+                        "openzeppelin.account.library.Account._execute_list"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 26,
-                        "end_line": 186,
+                        "end_col": 55,
+                        "end_line": 225,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "parent_location": [
-                            {
-                                "end_col": 42,
-                                "end_line": 188,
-                                "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                                },
-                                "start_col": 30,
-                                "start_line": 188
-                            },
-                            "While expanding the reference 'response_len' in:"
-                        ],
-                        "start_col": 14,
-                        "start_line": 186
+                        "start_col": 39,
+                        "start_line": 225
                     }
                 },
-                "331": {
+                "322": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.execute"
+                        "openzeppelin.account.library.Account._execute_list"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 29,
-                        "end_line": 185,
+                        "end_col": 56,
+                        "end_line": 225,
+                        "input_file": {
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                        },
+                        "start_col": 9,
+                        "start_line": 225
+                    }
+                },
+                "324": {
+                    "accessible_scopes": [
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account._execute_list"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 38,
+                        "end_line": 42,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 29,
-                                "end_line": 185,
+                                "end_col": 10,
+                                "end_line": 223,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 61,
-                                        "end_line": 188,
+                                        "end_col": 38,
+                                        "end_line": 42,
                                         "input_file": {
-                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                                         },
-                                        "start_col": 53,
-                                        "start_line": 188
+                                        "parent_location": [
+                                            {
+                                                "end_col": 10,
+                                                "end_line": 223,
+                                                "input_file": {
+                                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                                },
+                                                "parent_location": [
+                                                    {
+                                                        "end_col": 42,
+                                                        "end_line": 206,
+                                                        "input_file": {
+                                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                                        },
+                                                        "parent_location": [
+                                                            {
+                                                                "end_col": 10,
+                                                                "end_line": 229,
+                                                                "input_file": {
+                                                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                                                },
+                                                                "start_col": 30,
+                                                                "start_line": 227
+                                                            },
+                                                            "While trying to retrieve the implicit argument 'syscall_ptr' in:"
+                                                        ],
+                                                        "start_col": 24,
+                                                        "start_line": 206
+                                                    },
+                                                    "While expanding the reference 'syscall_ptr' in:"
+                                                ],
+                                                "start_col": 19,
+                                                "start_line": 218
+                                            },
+                                            "While trying to update the implicit return value 'syscall_ptr' in:"
+                                        ],
+                                        "start_col": 20,
+                                        "start_line": 42
                                     },
-                                    "While expanding the reference 'response' in:"
+                                    "While auto generating local variable for 'syscall_ptr'."
                                 ],
-                                "start_col": 14,
-                                "start_line": 185
+                                "start_col": 19,
+                                "start_line": 218
                             },
-                            "While auto generating local variable for 'response'."
+                            "While trying to update the implicit return value 'syscall_ptr' in:"
                         ],
-                        "start_col": 14,
-                        "start_line": 185
+                        "start_col": 20,
+                        "start_line": 42
                     }
                 },
-                "332": {
+                "325": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account.execute"
+                        "openzeppelin.account.library.Account._execute_list"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 63,
-                        "end_line": 188,
+                        "end_col": 26,
+                        "end_line": 228,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "start_col": 9,
-                        "start_line": 188
+                        "start_col": 13,
+                        "start_line": 228
                     }
                 },
-                "333": {
+                "327": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
@@ -8450,16 +8070,16 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 22,
-                        "end_line": 194,
+                        "end_col": 45,
+                        "end_line": 228,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "start_col": 9,
-                        "start_line": 194
+                        "start_col": 28,
+                        "start_line": 228
                     }
                 },
-                "335": {
+                "329": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
@@ -8468,16 +8088,34 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 11,
-                        "end_line": 197,
+                        "end_col": 74,
+                        "end_line": 228,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "start_col": 9,
-                        "start_line": 197
+                        "start_col": 47,
+                        "start_line": 228
                     }
                 },
-                "337": {
+                "330": {
+                    "accessible_scopes": [
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account._execute_list"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 10,
+                        "end_line": 229,
+                        "input_file": {
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                        },
+                        "start_col": 30,
+                        "start_line": 227
+                    }
+                },
+                "332": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
@@ -8487,39 +8125,51 @@
                     "hints": [],
                     "inst": {
                         "end_col": 42,
-                        "end_line": 191,
+                        "end_line": 206,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 42,
-                                "end_line": 191,
+                                "end_col": 10,
+                                "end_line": 229,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 25,
-                                        "end_line": 198,
+                                        "end_col": 42,
+                                        "end_line": 206,
                                         "input_file": {
-                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
-                                        "start_col": 13,
-                                        "start_line": 198
+                                        "parent_location": [
+                                            {
+                                                "end_col": 63,
+                                                "end_line": 230,
+                                                "input_file": {
+                                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                                },
+                                                "start_col": 9,
+                                                "start_line": 230
+                                            },
+                                            "While trying to retrieve the implicit argument 'syscall_ptr' in:"
+                                        ],
+                                        "start_col": 24,
+                                        "start_line": 206
                                     },
-                                    "While trying to retrieve the implicit argument 'syscall_ptr' in:"
+                                    "While expanding the reference 'syscall_ptr' in:"
                                 ],
-                                "start_col": 24,
-                                "start_line": 191
+                                "start_col": 30,
+                                "start_line": 227
                             },
-                            "While expanding the reference 'syscall_ptr' in:"
+                            "While trying to update the implicit return value 'syscall_ptr' in:"
                         ],
                         "start_col": 24,
-                        "start_line": 191
+                        "start_line": 206
                     }
                 },
-                "338": {
+                "333": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
@@ -8528,16 +8178,16 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 22,
-                        "end_line": 198,
+                        "end_col": 61,
+                        "end_line": 230,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "start_col": 21,
-                        "start_line": 198
+                        "start_col": 30,
+                        "start_line": 230
                     }
                 },
-                "340": {
+                "334": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
@@ -8546,1030 +8196,460 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 25,
-                        "end_line": 198,
+                        "end_col": 63,
+                        "end_line": 230,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "start_col": 13,
-                        "start_line": 198
+                        "start_col": 9,
+                        "start_line": 230
                     }
                 },
-                "341": {
+                "335": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account._execute_list"
+                        "openzeppelin.account.library.Account._from_call_array_to_call"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 42,
-                        "end_line": 191,
+                        "end_col": 11,
+                        "end_line": 237,
+                        "input_file": {
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                        },
+                        "start_col": 9,
+                        "start_line": 237
+                    }
+                },
+                "337": {
+                    "accessible_scopes": [
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account._from_call_array_to_call"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 53,
+                        "end_line": 233,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 38,
-                                "end_line": 42,
+                                "end_col": 53,
+                                "end_line": 233,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 10,
-                                        "end_line": 208,
+                                        "end_col": 23,
+                                        "end_line": 238,
                                         "input_file": {
-                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
-                                        "start_col": 19,
-                                        "start_line": 203
+                                        "start_col": 13,
+                                        "start_line": 238
                                     },
                                     "While trying to retrieve the implicit argument 'syscall_ptr' in:"
                                 ],
-                                "start_col": 20,
-                                "start_line": 42
+                                "start_col": 35,
+                                "start_line": 233
                             },
                             "While expanding the reference 'syscall_ptr' in:"
                         ],
-                        "start_col": 24,
-                        "start_line": 191
+                        "start_col": 35,
+                        "start_line": 233
                     }
                 },
-                "342": {
+                "338": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account._execute_list"
+                        "openzeppelin.account.library.Account._from_call_array_to_call"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 42,
-                        "end_line": 204,
+                        "end_col": 23,
+                        "end_line": 238,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "start_col": 30,
-                        "start_line": 204
+                        "start_col": 13,
+                        "start_line": 238
                     }
                 },
-                "343": {
+                "339": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account._execute_list"
+                        "openzeppelin.account.library.Account._from_call_array_to_call"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 49,
-                        "end_line": 205,
+                        "end_col": 31,
+                        "end_line": 243,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "start_col": 31,
-                        "start_line": 205
+                        "start_col": 16,
+                        "start_line": 243
                     }
                 },
-                "344": {
+                "340": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account._execute_list"
+                        "openzeppelin.account.library.Account._from_call_array_to_call"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 49,
-                        "end_line": 206,
+                        "end_col": 15,
+                        "end_line": 247,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "start_col": 27,
-                        "start_line": 206
+                        "start_col": 9,
+                        "start_line": 242
                     }
                 },
-                "345": {
+                "341": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account._execute_list"
+                        "openzeppelin.account.library.Account._from_call_array_to_call"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 40,
-                        "end_line": 207,
+                        "end_col": 43,
+                        "end_line": 244,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 22,
-                        "start_line": 207
+                        "start_line": 244
                     }
                 },
-                "346": {
+                "342": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account._execute_list"
+                        "openzeppelin.account.library.Account._from_call_array_to_call"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 10,
-                        "end_line": 208,
+                        "end_col": 15,
+                        "end_line": 247,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "start_col": 19,
-                        "start_line": 203
+                        "start_col": 9,
+                        "start_line": 242
                     }
                 },
-                "348": {
+                "343": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account._execute_list"
+                        "openzeppelin.account.library.Account._from_call_array_to_call"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 16,
-                        "end_line": 203,
+                        "end_col": 47,
+                        "end_line": 245,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "parent_location": [
-                            {
-                                "end_col": 16,
-                                "end_line": 203,
-                                "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                                },
-                                "start_col": 13,
-                                "start_line": 203
-                            },
-                            "While auto generating local variable for 'res'."
-                        ],
-                        "start_col": 13,
-                        "start_line": 203
+                        "start_col": 26,
+                        "start_line": 245
                     }
                 },
-                "349": {
+                "344": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account._execute_list"
+                        "openzeppelin.account.library.Account._from_call_array_to_call"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 16,
-                        "end_line": 203,
+                        "end_col": 15,
+                        "end_line": 247,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "parent_location": [
-                            {
-                                "end_col": 16,
-                                "end_line": 203,
-                                "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                                },
-                                "start_col": 13,
-                                "start_line": 203
-                            },
-                            "While auto generating local variable for 'res'."
-                        ],
-                        "start_col": 13,
-                        "start_line": 203
+                        "start_col": 9,
+                        "start_line": 242
                     }
                 },
-                "350": {
+                "345": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account._execute_list"
+                        "openzeppelin.account.library.Account._from_call_array_to_call"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 38,
-                        "end_line": 42,
+                        "end_col": 57,
+                        "end_line": 246,
+                        "input_file": {
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                        },
+                        "start_col": 33,
+                        "start_line": 246
+                    }
+                },
+                "346": {
+                    "accessible_scopes": [
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account._from_call_array_to_call"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 57,
+                        "end_line": 246,
+                        "input_file": {
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                        },
+                        "start_col": 22,
+                        "start_line": 246
+                    }
+                },
+                "347": {
+                    "accessible_scopes": [
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account._from_call_array_to_call"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 15,
+                        "end_line": 247,
+                        "input_file": {
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                        },
+                        "start_col": 9,
+                        "start_line": 242
+                    }
+                },
+                "348": {
+                    "accessible_scopes": [
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account._from_call_array_to_call"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 53,
+                        "end_line": 233,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 10,
-                                "end_line": 208,
+                                "end_col": 53,
+                                "end_line": 233,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 38,
-                                        "end_line": 42,
+                                        "end_col": 10,
+                                        "end_line": 251,
                                         "input_file": {
-                                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
-                                        "parent_location": [
-                                            {
-                                                "end_col": 10,
-                                                "end_line": 208,
-                                                "input_file": {
-                                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                                                },
-                                                "start_col": 19,
-                                                "start_line": 203
-                                            },
-                                            "While trying to update the implicit return value 'syscall_ptr' in:"
-                                        ],
-                                        "start_col": 20,
-                                        "start_line": 42
+                                        "start_col": 9,
+                                        "start_line": 249
                                     },
-                                    "While auto generating local variable for 'syscall_ptr'."
+                                    "While trying to retrieve the implicit argument 'syscall_ptr' in:"
                                 ],
-                                "start_col": 19,
-                                "start_line": 203
+                                "start_col": 35,
+                                "start_line": 233
                             },
-                            "While trying to update the implicit return value 'syscall_ptr' in:"
+                            "While expanding the reference 'syscall_ptr' in:"
                         ],
-                        "start_col": 20,
-                        "start_line": 42
+                        "start_col": 35,
+                        "start_line": 233
+                    }
+                },
+                "349": {
+                    "accessible_scopes": [
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account._from_call_array_to_call"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 31,
+                        "end_line": 250,
+                        "input_file": {
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                        },
+                        "start_col": 13,
+                        "start_line": 250
                     }
                 },
                 "351": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account._execute_list"
+                        "openzeppelin.account.library.Account._from_call_array_to_call"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 90,
-                        "end_line": 191,
+                        "end_col": 67,
+                        "end_line": 250,
+                        "input_file": {
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                        },
+                        "start_col": 33,
+                        "start_line": 250
+                    }
+                },
+                "353": {
+                    "accessible_scopes": [
+                        "openzeppelin.account.library",
+                        "openzeppelin.account.library.Account",
+                        "openzeppelin.account.library.Account._from_call_array_to_call"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 77,
+                        "end_line": 234,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 24,
-                                "end_line": 210,
+                                "end_col": 77,
+                                "end_line": 250,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
-                                "start_col": 16,
-                                "start_line": 210
+                                "start_col": 69,
+                                "start_line": 250
                             },
-                            "While expanding the reference 'response' in:"
+                            "While expanding the reference 'calldata' in:"
                         ],
-                        "start_col": 75,
-                        "start_line": 191
+                        "start_col": 62,
+                        "start_line": 234
                     }
                 },
-                "352": {
+                "354": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account._execute_list"
+                        "openzeppelin.account.library.Account._from_call_array_to_call"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 37,
-                        "end_line": 210,
+                        "end_col": 96,
+                        "end_line": 250,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "start_col": 26,
-                        "start_line": 210
+                        "start_col": 79,
+                        "start_line": 250
                     }
                 },
-                "353": {
+                "356": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account._execute_list"
+                        "openzeppelin.account.library.Account._from_call_array_to_call"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 55,
-                        "end_line": 210,
+                        "end_col": 10,
+                        "end_line": 251,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
-                        "start_col": 39,
-                        "start_line": 210
+                        "start_col": 9,
+                        "start_line": 249
                     }
                 },
-                "354": {
+                "358": {
                     "accessible_scopes": [
                         "openzeppelin.account.library",
                         "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account._execute_list"
+                        "openzeppelin.account.library.Account._from_call_array_to_call"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 56,
-                        "end_line": 210,
+                        "end_col": 19,
+                        "end_line": 252,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 9,
-                        "start_line": 210
+                        "start_line": 252
                     }
                 },
-                "356": {
+                "359": {
                     "accessible_scopes": [
-                        "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account._execute_list"
+                        "__main__",
+                        "__main__",
+                        "__main__.constructor"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 38,
-                        "end_line": 42,
+                        "end_col": 36,
+                        "end_line": 17,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 10,
-                                "end_line": 208,
+                                "end_col": 40,
+                                "end_line": 61,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 38,
-                                        "end_line": 42,
-                                        "input_file": {
-                                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
-                                        },
-                                        "parent_location": [
-                                            {
-                                                "end_col": 10,
-                                                "end_line": 208,
-                                                "input_file": {
-                                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                                                },
-                                                "parent_location": [
-                                                    {
-                                                        "end_col": 42,
-                                                        "end_line": 191,
-                                                        "input_file": {
-                                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                                                        },
-                                                        "parent_location": [
-                                                            {
-                                                                "end_col": 10,
-                                                                "end_line": 214,
-                                                                "input_file": {
-                                                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                                                                },
-                                                                "start_col": 30,
-                                                                "start_line": 212
-                                                            },
-                                                            "While trying to retrieve the implicit argument 'syscall_ptr' in:"
-                                                        ],
-                                                        "start_col": 24,
-                                                        "start_line": 191
-                                                    },
-                                                    "While expanding the reference 'syscall_ptr' in:"
-                                                ],
-                                                "start_col": 19,
-                                                "start_line": 203
-                                            },
-                                            "While trying to update the implicit return value 'syscall_ptr' in:"
-                                        ],
-                                        "start_col": 20,
-                                        "start_line": 42
-                                    },
-                                    "While auto generating local variable for 'syscall_ptr'."
-                                ],
-                                "start_col": 19,
-                                "start_line": 203
-                            },
-                            "While trying to update the implicit return value 'syscall_ptr' in:"
-                        ],
-                        "start_col": 20,
-                        "start_line": 42
-                    }
-                },
-                "357": {
-                    "accessible_scopes": [
-                        "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account._execute_list"
-                    ],
-                    "flow_tracking_data": null,
-                    "hints": [],
-                    "inst": {
-                        "end_col": 26,
-                        "end_line": 213,
-                        "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                        },
-                        "start_col": 13,
-                        "start_line": 213
-                    }
-                },
-                "359": {
-                    "accessible_scopes": [
-                        "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account._execute_list"
-                    ],
-                    "flow_tracking_data": null,
-                    "hints": [],
-                    "inst": {
-                        "end_col": 45,
-                        "end_line": 213,
-                        "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                        },
-                        "start_col": 28,
-                        "start_line": 213
-                    }
-                },
-                "361": {
-                    "accessible_scopes": [
-                        "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account._execute_list"
-                    ],
-                    "flow_tracking_data": null,
-                    "hints": [],
-                    "inst": {
-                        "end_col": 74,
-                        "end_line": 213,
-                        "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                        },
-                        "start_col": 47,
-                        "start_line": 213
-                    }
-                },
-                "362": {
-                    "accessible_scopes": [
-                        "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account._execute_list"
-                    ],
-                    "flow_tracking_data": null,
-                    "hints": [],
-                    "inst": {
-                        "end_col": 10,
-                        "end_line": 214,
-                        "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                        },
-                        "start_col": 30,
-                        "start_line": 212
-                    }
-                },
-                "364": {
-                    "accessible_scopes": [
-                        "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account._execute_list"
-                    ],
-                    "flow_tracking_data": null,
-                    "hints": [],
-                    "inst": {
-                        "end_col": 42,
-                        "end_line": 191,
-                        "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                        },
-                        "parent_location": [
-                            {
-                                "end_col": 10,
-                                "end_line": 214,
-                                "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                                },
-                                "parent_location": [
-                                    {
-                                        "end_col": 42,
-                                        "end_line": 191,
-                                        "input_file": {
-                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                                        },
-                                        "parent_location": [
-                                            {
-                                                "end_col": 51,
-                                                "end_line": 215,
-                                                "input_file": {
-                                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                                                },
-                                                "start_col": 9,
-                                                "start_line": 215
-                                            },
-                                            "While trying to retrieve the implicit argument 'syscall_ptr' in:"
-                                        ],
-                                        "start_col": 24,
-                                        "start_line": 191
-                                    },
-                                    "While expanding the reference 'syscall_ptr' in:"
-                                ],
-                                "start_col": 30,
-                                "start_line": 212
-                            },
-                            "While trying to update the implicit return value 'syscall_ptr' in:"
-                        ],
-                        "start_col": 24,
-                        "start_line": 191
-                    }
-                },
-                "365": {
-                    "accessible_scopes": [
-                        "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account._execute_list"
-                    ],
-                    "flow_tracking_data": null,
-                    "hints": [],
-                    "inst": {
-                        "end_col": 48,
-                        "end_line": 215,
-                        "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                        },
-                        "start_col": 17,
-                        "start_line": 215
-                    }
-                },
-                "366": {
-                    "accessible_scopes": [
-                        "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account._execute_list"
-                    ],
-                    "flow_tracking_data": null,
-                    "hints": [],
-                    "inst": {
-                        "end_col": 51,
-                        "end_line": 215,
-                        "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                        },
-                        "start_col": 9,
-                        "start_line": 215
-                    }
-                },
-                "367": {
-                    "accessible_scopes": [
-                        "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account._from_call_array_to_call"
-                    ],
-                    "flow_tracking_data": null,
-                    "hints": [],
-                    "inst": {
-                        "end_col": 11,
-                        "end_line": 222,
-                        "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                        },
-                        "start_col": 9,
-                        "start_line": 222
-                    }
-                },
-                "369": {
-                    "accessible_scopes": [
-                        "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account._from_call_array_to_call"
-                    ],
-                    "flow_tracking_data": null,
-                    "hints": [],
-                    "inst": {
-                        "end_col": 53,
-                        "end_line": 218,
-                        "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                        },
-                        "parent_location": [
-                            {
-                                "end_col": 53,
-                                "end_line": 218,
-                                "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                                },
-                                "parent_location": [
-                                    {
-                                        "end_col": 23,
-                                        "end_line": 223,
-                                        "input_file": {
-                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                                        },
-                                        "start_col": 13,
-                                        "start_line": 223
-                                    },
-                                    "While trying to retrieve the implicit argument 'syscall_ptr' in:"
-                                ],
-                                "start_col": 35,
-                                "start_line": 218
-                            },
-                            "While expanding the reference 'syscall_ptr' in:"
-                        ],
-                        "start_col": 35,
-                        "start_line": 218
-                    }
-                },
-                "370": {
-                    "accessible_scopes": [
-                        "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account._from_call_array_to_call"
-                    ],
-                    "flow_tracking_data": null,
-                    "hints": [],
-                    "inst": {
-                        "end_col": 23,
-                        "end_line": 223,
-                        "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                        },
-                        "start_col": 13,
-                        "start_line": 223
-                    }
-                },
-                "371": {
-                    "accessible_scopes": [
-                        "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account._from_call_array_to_call"
-                    ],
-                    "flow_tracking_data": null,
-                    "hints": [],
-                    "inst": {
-                        "end_col": 31,
-                        "end_line": 228,
-                        "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                        },
-                        "start_col": 16,
-                        "start_line": 228
-                    }
-                },
-                "372": {
-                    "accessible_scopes": [
-                        "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account._from_call_array_to_call"
-                    ],
-                    "flow_tracking_data": null,
-                    "hints": [],
-                    "inst": {
-                        "end_col": 15,
-                        "end_line": 232,
-                        "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                        },
-                        "start_col": 9,
-                        "start_line": 227
-                    }
-                },
-                "373": {
-                    "accessible_scopes": [
-                        "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account._from_call_array_to_call"
-                    ],
-                    "flow_tracking_data": null,
-                    "hints": [],
-                    "inst": {
-                        "end_col": 43,
-                        "end_line": 229,
-                        "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                        },
-                        "start_col": 22,
-                        "start_line": 229
-                    }
-                },
-                "374": {
-                    "accessible_scopes": [
-                        "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account._from_call_array_to_call"
-                    ],
-                    "flow_tracking_data": null,
-                    "hints": [],
-                    "inst": {
-                        "end_col": 15,
-                        "end_line": 232,
-                        "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                        },
-                        "start_col": 9,
-                        "start_line": 227
-                    }
-                },
-                "375": {
-                    "accessible_scopes": [
-                        "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account._from_call_array_to_call"
-                    ],
-                    "flow_tracking_data": null,
-                    "hints": [],
-                    "inst": {
-                        "end_col": 47,
-                        "end_line": 230,
-                        "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                        },
-                        "start_col": 26,
-                        "start_line": 230
-                    }
-                },
-                "376": {
-                    "accessible_scopes": [
-                        "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account._from_call_array_to_call"
-                    ],
-                    "flow_tracking_data": null,
-                    "hints": [],
-                    "inst": {
-                        "end_col": 15,
-                        "end_line": 232,
-                        "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                        },
-                        "start_col": 9,
-                        "start_line": 227
-                    }
-                },
-                "377": {
-                    "accessible_scopes": [
-                        "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account._from_call_array_to_call"
-                    ],
-                    "flow_tracking_data": null,
-                    "hints": [],
-                    "inst": {
-                        "end_col": 57,
-                        "end_line": 231,
-                        "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                        },
-                        "start_col": 33,
-                        "start_line": 231
-                    }
-                },
-                "378": {
-                    "accessible_scopes": [
-                        "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account._from_call_array_to_call"
-                    ],
-                    "flow_tracking_data": null,
-                    "hints": [],
-                    "inst": {
-                        "end_col": 57,
-                        "end_line": 231,
-                        "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                        },
-                        "start_col": 22,
-                        "start_line": 231
-                    }
-                },
-                "379": {
-                    "accessible_scopes": [
-                        "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account._from_call_array_to_call"
-                    ],
-                    "flow_tracking_data": null,
-                    "hints": [],
-                    "inst": {
-                        "end_col": 15,
-                        "end_line": 232,
-                        "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                        },
-                        "start_col": 9,
-                        "start_line": 227
-                    }
-                },
-                "380": {
-                    "accessible_scopes": [
-                        "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account._from_call_array_to_call"
-                    ],
-                    "flow_tracking_data": null,
-                    "hints": [],
-                    "inst": {
-                        "end_col": 53,
-                        "end_line": 218,
-                        "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                        },
-                        "parent_location": [
-                            {
-                                "end_col": 53,
-                                "end_line": 218,
-                                "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                                },
-                                "parent_location": [
-                                    {
-                                        "end_col": 10,
-                                        "end_line": 236,
-                                        "input_file": {
-                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                                        },
-                                        "start_col": 9,
-                                        "start_line": 234
-                                    },
-                                    "While trying to retrieve the implicit argument 'syscall_ptr' in:"
-                                ],
-                                "start_col": 35,
-                                "start_line": 218
-                            },
-                            "While expanding the reference 'syscall_ptr' in:"
-                        ],
-                        "start_col": 35,
-                        "start_line": 218
-                    }
-                },
-                "381": {
-                    "accessible_scopes": [
-                        "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account._from_call_array_to_call"
-                    ],
-                    "flow_tracking_data": null,
-                    "hints": [],
-                    "inst": {
-                        "end_col": 31,
-                        "end_line": 235,
-                        "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                        },
-                        "start_col": 13,
-                        "start_line": 235
-                    }
-                },
-                "383": {
-                    "accessible_scopes": [
-                        "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account._from_call_array_to_call"
-                    ],
-                    "flow_tracking_data": null,
-                    "hints": [],
-                    "inst": {
-                        "end_col": 67,
-                        "end_line": 235,
-                        "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                        },
-                        "start_col": 33,
-                        "start_line": 235
-                    }
-                },
-                "385": {
-                    "accessible_scopes": [
-                        "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account._from_call_array_to_call"
-                    ],
-                    "flow_tracking_data": null,
-                    "hints": [],
-                    "inst": {
-                        "end_col": 77,
-                        "end_line": 219,
-                        "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                        },
-                        "parent_location": [
-                            {
-                                "end_col": 77,
-                                "end_line": 235,
-                                "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                                },
-                                "start_col": 69,
-                                "start_line": 235
-                            },
-                            "While expanding the reference 'calldata' in:"
-                        ],
-                        "start_col": 62,
-                        "start_line": 219
-                    }
-                },
-                "386": {
-                    "accessible_scopes": [
-                        "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account._from_call_array_to_call"
-                    ],
-                    "flow_tracking_data": null,
-                    "hints": [],
-                    "inst": {
-                        "end_col": 96,
-                        "end_line": 235,
-                        "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                        },
-                        "start_col": 79,
-                        "start_line": 235
-                    }
-                },
-                "388": {
-                    "accessible_scopes": [
-                        "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account._from_call_array_to_call"
-                    ],
-                    "flow_tracking_data": null,
-                    "hints": [],
-                    "inst": {
-                        "end_col": 10,
-                        "end_line": 236,
-                        "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                        },
-                        "start_col": 9,
-                        "start_line": 234
-                    }
-                },
-                "390": {
-                    "accessible_scopes": [
-                        "openzeppelin.account.library",
-                        "openzeppelin.account.library.Account",
-                        "openzeppelin.account.library.Account._from_call_array_to_call"
-                    ],
-                    "flow_tracking_data": null,
-                    "hints": [],
-                    "inst": {
-                        "end_col": 19,
-                        "end_line": 237,
-                        "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                        },
-                        "start_col": 9,
-                        "start_line": 237
-                    }
-                },
-                "391": {
-                    "accessible_scopes": [
-                        "__main__",
-                        "__main__",
-                        "__main__.constructor"
-                    ],
-                    "flow_tracking_data": null,
-                    "hints": [],
-                    "inst": {
-                        "end_col": 36,
-                        "end_line": 18,
-                        "input_file": {
-                            "filename": "src/openzeppelin/account/presets/Account.cairo"
-                        },
-                        "parent_location": [
-                            {
-                                "end_col": 40,
-                                "end_line": 57,
-                                "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
-                                },
-                                "parent_location": [
-                                    {
-                                        "end_col": 36,
-                                        "end_line": 21,
+                                        "end_col": 35,
+                                        "end_line": 20,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 5,
-                                        "start_line": 21
+                                        "start_line": 20
                                     },
                                     "While trying to retrieve the implicit argument 'syscall_ptr' in:"
                                 ],
                                 "start_col": 22,
-                                "start_line": 57
+                                "start_line": 61
                             },
                             "While expanding the reference 'syscall_ptr' in:"
                         ],
                         "start_col": 18,
-                        "start_line": 18
+                        "start_line": 17
                     }
                 },
-                "392": {
+                "360": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -9579,39 +8659,39 @@
                     "hints": [],
                     "inst": {
                         "end_col": 64,
-                        "end_line": 18,
+                        "end_line": 17,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 68,
-                                "end_line": 57,
+                                "end_line": 61,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 36,
-                                        "end_line": 21,
+                                        "end_col": 35,
+                                        "end_line": 20,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 5,
-                                        "start_line": 21
+                                        "start_line": 20
                                     },
                                     "While trying to retrieve the implicit argument 'pedersen_ptr' in:"
                                 ],
                                 "start_col": 42,
-                                "start_line": 57
+                                "start_line": 61
                             },
                             "While expanding the reference 'pedersen_ptr' in:"
                         ],
                         "start_col": 38,
-                        "start_line": 18
+                        "start_line": 17
                     }
                 },
-                "393": {
+                "361": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -9621,39 +8701,39 @@
                     "hints": [],
                     "inst": {
                         "end_col": 81,
-                        "end_line": 18,
+                        "end_line": 17,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 85,
-                                "end_line": 57,
+                                "end_line": 61,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 36,
-                                        "end_line": 21,
+                                        "end_col": 35,
+                                        "end_line": 20,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 5,
-                                        "start_line": 21
+                                        "start_line": 20
                                     },
                                     "While trying to retrieve the implicit argument 'range_check_ptr' in:"
                                 ],
                                 "start_col": 70,
-                                "start_line": 57
+                                "start_line": 61
                             },
                             "While expanding the reference 'range_check_ptr' in:"
                         ],
                         "start_col": 66,
-                        "start_line": 18
+                        "start_line": 17
                     }
                 },
-                "394": {
+                "362": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -9662,28 +8742,28 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 21,
-                        "end_line": 19,
+                        "end_col": 20,
+                        "end_line": 18,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 35,
-                                "end_line": 21,
+                                "end_col": 34,
+                                "end_line": 20,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 25,
-                                "start_line": 21
+                                "start_line": 20
                             },
-                            "While expanding the reference 'public_key' in:"
+                            "While expanding the reference 'publicKey' in:"
                         ],
                         "start_col": 5,
-                        "start_line": 19
+                        "start_line": 18
                     }
                 },
-                "395": {
+                "363": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -9692,16 +8772,16 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 36,
-                        "end_line": 21,
+                        "end_col": 35,
+                        "end_line": 20,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 5,
-                        "start_line": 21
+                        "start_line": 20
                     }
                 },
-                "397": {
+                "365": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -9711,15 +8791,15 @@
                     "hints": [],
                     "inst": {
                         "end_col": 15,
-                        "end_line": 22,
+                        "end_line": 21,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 5,
-                        "start_line": 22
+                        "start_line": 21
                     }
                 },
-                "398": {
+                "366": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -9732,12 +8812,12 @@
                         "end_col": 40,
                         "end_line": 2,
                         "input_file": {
-                            "filename": "autogen/starknet/arg_processor/fcae171a11efdbb3d6f68abb567d4209a3b5b40b77b7badc1698f31527b74fb9.cairo"
+                            "filename": "autogen/starknet/arg_processor/e0103dcf78458048e6a2fbe82ac74a16ee35839175ed068cc53ace2ff3c8d843.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 21,
-                                "end_line": 19,
+                                "end_col": 20,
+                                "end_line": 18,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -9751,7 +8831,7 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 18,
+                                                "end_line": 17,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
@@ -9765,12 +8845,12 @@
                                                         "parent_location": [
                                                             {
                                                                 "end_col": 17,
-                                                                "end_line": 18,
+                                                                "end_line": 17,
                                                                 "input_file": {
                                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                                 },
                                                                 "start_col": 6,
-                                                                "start_line": 18
+                                                                "start_line": 17
                                                             },
                                                             "While handling calldata of"
                                                         ],
@@ -9780,7 +8860,7 @@
                                                     "While expanding the reference '__calldata_actual_size' in:"
                                                 ],
                                                 "start_col": 6,
-                                                "start_line": 18
+                                                "start_line": 17
                                             },
                                             "While handling calldata of"
                                         ],
@@ -9790,15 +8870,15 @@
                                     "While expanding the reference '__calldata_ptr' in:"
                                 ],
                                 "start_col": 5,
-                                "start_line": 19
+                                "start_line": 18
                             },
-                            "While handling calldata argument 'public_key'"
+                            "While handling calldata argument 'publicKey'"
                         ],
                         "start_col": 22,
                         "start_line": 2
                     }
                 },
-                "400": {
+                "368": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -9816,12 +8896,12 @@
                         "parent_location": [
                             {
                                 "end_col": 17,
-                                "end_line": 18,
+                                "end_line": 17,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 18
+                                "start_line": 17
                             },
                             "While handling calldata of"
                         ],
@@ -9829,7 +8909,7 @@
                         "start_line": 1
                     }
                 },
-                "401": {
+                "369": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -9847,7 +8927,7 @@
                         "parent_location": [
                             {
                                 "end_col": 36,
-                                "end_line": 18,
+                                "end_line": 17,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -9856,17 +8936,17 @@
                                         "end_col": 55,
                                         "end_line": 1,
                                         "input_file": {
-                                            "filename": "autogen/starknet/external/constructor/f17d1b7727f3569ff43c4ebf78ae9e4a75a5fc622bff843043f7400f1ba413ea.cairo"
+                                            "filename": "autogen/starknet/external/constructor/85878491738bbe4da46aa469fbd2786d48e333915f5f6757828b7b21676593c8.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 18,
+                                                "end_line": 17,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 18
+                                                "start_line": 17
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -9876,7 +8956,7 @@
                                     "While expanding the reference 'syscall_ptr' in:"
                                 ],
                                 "start_col": 18,
-                                "start_line": 18
+                                "start_line": 17
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -9884,7 +8964,7 @@
                         "start_line": 1
                     }
                 },
-                "402": {
+                "370": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -9902,7 +8982,7 @@
                         "parent_location": [
                             {
                                 "end_col": 64,
-                                "end_line": 18,
+                                "end_line": 17,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -9911,17 +8991,17 @@
                                         "end_col": 82,
                                         "end_line": 1,
                                         "input_file": {
-                                            "filename": "autogen/starknet/external/constructor/f17d1b7727f3569ff43c4ebf78ae9e4a75a5fc622bff843043f7400f1ba413ea.cairo"
+                                            "filename": "autogen/starknet/external/constructor/85878491738bbe4da46aa469fbd2786d48e333915f5f6757828b7b21676593c8.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 18,
+                                                "end_line": 17,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 18
+                                                "start_line": 17
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -9931,7 +9011,7 @@
                                     "While expanding the reference 'pedersen_ptr' in:"
                                 ],
                                 "start_col": 38,
-                                "start_line": 18
+                                "start_line": 17
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -9939,7 +9019,7 @@
                         "start_line": 1
                     }
                 },
-                "403": {
+                "371": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -9957,7 +9037,7 @@
                         "parent_location": [
                             {
                                 "end_col": 81,
-                                "end_line": 18,
+                                "end_line": 17,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -9966,17 +9046,17 @@
                                         "end_col": 115,
                                         "end_line": 1,
                                         "input_file": {
-                                            "filename": "autogen/starknet/external/constructor/f17d1b7727f3569ff43c4ebf78ae9e4a75a5fc622bff843043f7400f1ba413ea.cairo"
+                                            "filename": "autogen/starknet/external/constructor/85878491738bbe4da46aa469fbd2786d48e333915f5f6757828b7b21676593c8.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 18,
+                                                "end_line": 17,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 18
+                                                "start_line": 17
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -9986,7 +9066,7 @@
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
                                 "start_col": 66,
-                                "start_line": 18
+                                "start_line": 17
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -9994,7 +9074,7 @@
                         "start_line": 1
                     }
                 },
-                "404": {
+                "372": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -10004,52 +9084,52 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 49,
+                        "end_col": 48,
                         "end_line": 1,
                         "input_file": {
-                            "filename": "autogen/starknet/arg_processor/fcae171a11efdbb3d6f68abb567d4209a3b5b40b77b7badc1698f31527b74fb9.cairo"
+                            "filename": "autogen/starknet/arg_processor/e0103dcf78458048e6a2fbe82ac74a16ee35839175ed068cc53ace2ff3c8d843.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 21,
-                                "end_line": 19,
+                                "end_col": 20,
+                                "end_line": 18,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 153,
+                                        "end_col": 151,
                                         "end_line": 1,
                                         "input_file": {
-                                            "filename": "autogen/starknet/external/constructor/f17d1b7727f3569ff43c4ebf78ae9e4a75a5fc622bff843043f7400f1ba413ea.cairo"
+                                            "filename": "autogen/starknet/external/constructor/85878491738bbe4da46aa469fbd2786d48e333915f5f6757828b7b21676593c8.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 18,
+                                                "end_line": 17,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 18
+                                                "start_line": 17
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
-                                        "start_col": 128,
+                                        "start_col": 127,
                                         "start_line": 1
                                     },
-                                    "While expanding the reference '__calldata_arg_public_key' in:"
+                                    "While expanding the reference '__calldata_arg_publicKey' in:"
                                 ],
                                 "start_col": 5,
-                                "start_line": 19
+                                "start_line": 18
                             },
-                            "While handling calldata argument 'public_key'"
+                            "While handling calldata argument 'publicKey'"
                         ],
-                        "start_col": 33,
+                        "start_col": 32,
                         "start_line": 1
                     }
                 },
-                "405": {
+                "373": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -10060,15 +9140,15 @@
                     "hints": [],
                     "inst": {
                         "end_col": 17,
-                        "end_line": 18,
+                        "end_line": 17,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 6,
-                        "start_line": 18
+                        "start_line": 17
                     }
                 },
-                "407": {
+                "375": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -10082,17 +9162,17 @@
                                 "end_col": 34,
                                 "end_line": 2,
                                 "input_file": {
-                                    "filename": "autogen/starknet/external/constructor/f17d1b7727f3569ff43c4ebf78ae9e4a75a5fc622bff843043f7400f1ba413ea.cairo"
+                                    "filename": "autogen/starknet/external/constructor/85878491738bbe4da46aa469fbd2786d48e333915f5f6757828b7b21676593c8.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 17,
-                                        "end_line": 18,
+                                        "end_line": 17,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 6,
-                                        "start_line": 18
+                                        "start_line": 17
                                     },
                                     "While constructing the external wrapper for:"
                                 ],
@@ -10106,17 +9186,17 @@
                         "end_col": 24,
                         "end_line": 3,
                         "input_file": {
-                            "filename": "autogen/starknet/external/constructor/f17d1b7727f3569ff43c4ebf78ae9e4a75a5fc622bff843043f7400f1ba413ea.cairo"
+                            "filename": "autogen/starknet/external/constructor/85878491738bbe4da46aa469fbd2786d48e333915f5f6757828b7b21676593c8.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 17,
-                                "end_line": 18,
+                                "end_line": 17,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 18
+                                "start_line": 17
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -10124,7 +9204,7 @@
                         "start_line": 3
                     }
                 },
-                "409": {
+                "377": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -10137,12 +9217,12 @@
                         "end_col": 55,
                         "end_line": 1,
                         "input_file": {
-                            "filename": "autogen/starknet/external/constructor/f17d1b7727f3569ff43c4ebf78ae9e4a75a5fc622bff843043f7400f1ba413ea.cairo"
+                            "filename": "autogen/starknet/external/constructor/85878491738bbe4da46aa469fbd2786d48e333915f5f6757828b7b21676593c8.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 17,
-                                "end_line": 18,
+                                "end_line": 17,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -10156,12 +9236,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 18,
+                                                "end_line": 17,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 18
+                                                "start_line": 17
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -10171,7 +9251,7 @@
                                     "While expanding the reference 'syscall_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 18
+                                "start_line": 17
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -10179,7 +9259,7 @@
                         "start_line": 1
                     }
                 },
-                "410": {
+                "378": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -10192,12 +9272,12 @@
                         "end_col": 82,
                         "end_line": 1,
                         "input_file": {
-                            "filename": "autogen/starknet/external/constructor/f17d1b7727f3569ff43c4ebf78ae9e4a75a5fc622bff843043f7400f1ba413ea.cairo"
+                            "filename": "autogen/starknet/external/constructor/85878491738bbe4da46aa469fbd2786d48e333915f5f6757828b7b21676593c8.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 17,
-                                "end_line": 18,
+                                "end_line": 17,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -10211,12 +9291,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 18,
+                                                "end_line": 17,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 18
+                                                "start_line": 17
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -10226,7 +9306,7 @@
                                     "While expanding the reference 'pedersen_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 18
+                                "start_line": 17
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -10234,7 +9314,7 @@
                         "start_line": 1
                     }
                 },
-                "411": {
+                "379": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -10247,12 +9327,12 @@
                         "end_col": 115,
                         "end_line": 1,
                         "input_file": {
-                            "filename": "autogen/starknet/external/constructor/f17d1b7727f3569ff43c4ebf78ae9e4a75a5fc622bff843043f7400f1ba413ea.cairo"
+                            "filename": "autogen/starknet/external/constructor/85878491738bbe4da46aa469fbd2786d48e333915f5f6757828b7b21676593c8.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 17,
-                                "end_line": 18,
+                                "end_line": 17,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -10266,12 +9346,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 18,
+                                                "end_line": 17,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 18
+                                                "start_line": 17
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -10281,7 +9361,7 @@
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 18
+                                "start_line": 17
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -10289,7 +9369,7 @@
                         "start_line": 1
                     }
                 },
-                "412": {
+                "380": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -10307,7 +9387,7 @@
                         "parent_location": [
                             {
                                 "end_col": 17,
-                                "end_line": 18,
+                                "end_line": 17,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -10321,12 +9401,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 18,
+                                                "end_line": 17,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 18
+                                                "start_line": 17
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -10336,7 +9416,7 @@
                                     "While expanding the reference 'ecdsa_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 18
+                                "start_line": 17
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -10344,7 +9424,7 @@
                         "start_line": 1
                     }
                 },
-                "413": {
+                "381": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -10362,7 +9442,7 @@
                         "parent_location": [
                             {
                                 "end_col": 17,
-                                "end_line": 18,
+                                "end_line": 17,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -10376,12 +9456,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 18,
+                                                "end_line": 17,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 18
+                                                "start_line": 17
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -10391,7 +9471,7 @@
                                     "While expanding the reference 'bitwise_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 18
+                                "start_line": 17
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -10399,7 +9479,7 @@
                         "start_line": 1
                     }
                 },
-                "414": {
+                "382": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -10412,12 +9492,12 @@
                         "end_col": 21,
                         "end_line": 4,
                         "input_file": {
-                            "filename": "autogen/starknet/external/constructor/f17d1b7727f3569ff43c4ebf78ae9e4a75a5fc622bff843043f7400f1ba413ea.cairo"
+                            "filename": "autogen/starknet/external/constructor/85878491738bbe4da46aa469fbd2786d48e333915f5f6757828b7b21676593c8.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 17,
-                                "end_line": 18,
+                                "end_line": 17,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -10431,12 +9511,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 18,
+                                                "end_line": 17,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 18
+                                                "start_line": 17
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -10446,7 +9526,7 @@
                                     "While expanding the reference 'retdata_size' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 18
+                                "start_line": 17
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -10454,7 +9534,7 @@
                         "start_line": 4
                     }
                 },
-                "416": {
+                "384": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -10467,12 +9547,12 @@
                         "end_col": 16,
                         "end_line": 3,
                         "input_file": {
-                            "filename": "autogen/starknet/external/constructor/f17d1b7727f3569ff43c4ebf78ae9e4a75a5fc622bff843043f7400f1ba413ea.cairo"
+                            "filename": "autogen/starknet/external/constructor/85878491738bbe4da46aa469fbd2786d48e333915f5f6757828b7b21676593c8.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 17,
-                                "end_line": 18,
+                                "end_line": 17,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -10486,12 +9566,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 18,
+                                                "end_line": 17,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 18
+                                                "start_line": 17
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -10501,7 +9581,7 @@
                                     "While expanding the reference 'retdata' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 18
+                                "start_line": 17
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -10509,7 +9589,7 @@
                         "start_line": 3
                     }
                 },
-                "417": {
+                "385": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -10527,12 +9607,12 @@
                         "parent_location": [
                             {
                                 "end_col": 17,
-                                "end_line": 18,
+                                "end_line": 17,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 18
+                                "start_line": 17
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -10540,7 +9620,7 @@
                         "start_line": 1
                     }
                 },
-                "418": {
+                "386": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -10550,39 +9630,39 @@
                     "hints": [],
                     "inst": {
                         "end_col": 37,
-                        "end_line": 30,
+                        "end_line": 29,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 43,
-                                "end_line": 82,
+                                "end_line": 85,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 54,
-                                        "end_line": 33,
+                                        "end_col": 53,
+                                        "end_line": 32,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
-                                        "start_col": 30,
-                                        "start_line": 33
+                                        "start_col": 29,
+                                        "start_line": 32
                                     },
                                     "While trying to retrieve the implicit argument 'syscall_ptr' in:"
                                 ],
                                 "start_col": 25,
-                                "start_line": 82
+                                "start_line": 85
                             },
                             "While expanding the reference 'syscall_ptr' in:"
                         ],
                         "start_col": 19,
-                        "start_line": 30
+                        "start_line": 29
                     }
                 },
-                "419": {
+                "387": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -10592,39 +9672,39 @@
                     "hints": [],
                     "inst": {
                         "end_col": 65,
-                        "end_line": 30,
+                        "end_line": 29,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 71,
-                                "end_line": 82,
+                                "end_line": 85,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 54,
-                                        "end_line": 33,
+                                        "end_col": 53,
+                                        "end_line": 32,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
-                                        "start_col": 30,
-                                        "start_line": 33
+                                        "start_col": 29,
+                                        "start_line": 32
                                     },
                                     "While trying to retrieve the implicit argument 'pedersen_ptr' in:"
                                 ],
                                 "start_col": 45,
-                                "start_line": 82
+                                "start_line": 85
                             },
                             "While expanding the reference 'pedersen_ptr' in:"
                         ],
                         "start_col": 39,
-                        "start_line": 30
+                        "start_line": 29
                     }
                 },
-                "420": {
+                "388": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -10634,39 +9714,39 @@
                     "hints": [],
                     "inst": {
                         "end_col": 82,
-                        "end_line": 30,
+                        "end_line": 29,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 88,
-                                "end_line": 82,
+                                "end_line": 85,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 54,
-                                        "end_line": 33,
+                                        "end_col": 53,
+                                        "end_line": 32,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
-                                        "start_col": 30,
-                                        "start_line": 33
+                                        "start_col": 29,
+                                        "start_line": 32
                                     },
                                     "While trying to retrieve the implicit argument 'range_check_ptr' in:"
                                 ],
                                 "start_col": 73,
-                                "start_line": 82
+                                "start_line": 85
                             },
                             "While expanding the reference 'range_check_ptr' in:"
                         ],
                         "start_col": 67,
-                        "start_line": 30
+                        "start_line": 29
                     }
                 },
-                "421": {
+                "389": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -10675,16 +9755,16 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 54,
-                        "end_line": 33,
+                        "end_col": 53,
+                        "end_line": 32,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
-                        "start_col": 30,
-                        "start_line": 33
+                        "start_col": 29,
+                        "start_line": 32
                     }
                 },
-                "423": {
+                "391": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -10693,16 +9773,16 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 35,
-                        "end_line": 34,
+                        "end_col": 34,
+                        "end_line": 33,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 5,
-                        "start_line": 34
+                        "start_line": 33
                     }
                 },
-                "424": {
+                "392": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -10721,12 +9801,12 @@
                                 "parent_location": [
                                     {
                                         "end_col": 18,
-                                        "end_line": 30,
+                                        "end_line": 29,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 6,
-                                        "start_line": 30
+                                        "start_line": 29
                                     },
                                     "While handling return value of"
                                 ],
@@ -10745,12 +9825,12 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 30,
+                                "end_line": 29,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 30
+                                "start_line": 29
                             },
                             "While handling return value of"
                         ],
@@ -10758,7 +9838,7 @@
                         "start_line": 4
                     }
                 },
-                "426": {
+                "394": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -10776,12 +9856,12 @@
                         "parent_location": [
                             {
                                 "end_col": 20,
-                                "end_line": 31,
+                                "end_line": 30,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 5,
-                                "start_line": 31
+                                "start_line": 30
                             },
                             "While handling return value 'publicKey'"
                         ],
@@ -10789,7 +9869,7 @@
                         "start_line": 1
                     }
                 },
-                "427": {
+                "395": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -10807,7 +9887,7 @@
                         "parent_location": [
                             {
                                 "end_col": 20,
-                                "end_line": 31,
+                                "end_line": 30,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -10821,12 +9901,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 30,
+                                                "end_line": 29,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 30
+                                                "start_line": 29
                                             },
                                             "While handling return value of"
                                         ],
@@ -10836,7 +9916,7 @@
                                     "While expanding the reference '__return_value_ptr' in:"
                                 ],
                                 "start_col": 5,
-                                "start_line": 31
+                                "start_line": 30
                             },
                             "While handling return value 'publicKey'"
                         ],
@@ -10844,7 +9924,7 @@
                         "start_line": 2
                     }
                 },
-                "429": {
+                "397": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -10862,7 +9942,7 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 30,
+                                "end_line": 29,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -10876,12 +9956,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 30,
+                                                "end_line": 29,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 30
+                                                "start_line": 29
                                             },
                                             "While handling return value of"
                                         ],
@@ -10891,7 +9971,7 @@
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 30
+                                "start_line": 29
                             },
                             "While handling return value of"
                         ],
@@ -10899,7 +9979,7 @@
                         "start_line": 1
                     }
                 },
-                "430": {
+                "398": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -10917,12 +9997,12 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 30,
+                                "end_line": 29,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 30
+                                "start_line": 29
                             },
                             "While handling return value of"
                         ],
@@ -10930,7 +10010,7 @@
                         "start_line": 11
                     }
                 },
-                "431": {
+                "399": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -10948,7 +10028,7 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 30,
+                                "end_line": 29,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -10962,12 +10042,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 30,
+                                                "end_line": 29,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 30
+                                                "start_line": 29
                                             },
                                             "While handling return value of"
                                         ],
@@ -10977,7 +10057,7 @@
                                     "While expanding the reference '__return_value_ptr_start' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 30
+                                "start_line": 29
                             },
                             "While handling return value of"
                         ],
@@ -10985,7 +10065,7 @@
                         "start_line": 5
                     }
                 },
-                "432": {
+                "400": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -11003,12 +10083,12 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 30,
+                                "end_line": 29,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 30
+                                "start_line": 29
                             },
                             "While handling return value of"
                         ],
@@ -11016,7 +10096,7 @@
                         "start_line": 9
                     }
                 },
-                "433": {
+                "401": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -11034,12 +10114,12 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 30,
+                                "end_line": 29,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 30
+                                "start_line": 29
                             },
                             "While handling calldata of"
                         ],
@@ -11047,7 +10127,7 @@
                         "start_line": 1
                     }
                 },
-                "434": {
+                "402": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -11065,7 +10145,7 @@
                         "parent_location": [
                             {
                                 "end_col": 37,
-                                "end_line": 30,
+                                "end_line": 29,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -11079,12 +10159,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 30,
+                                                "end_line": 29,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 30
+                                                "start_line": 29
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -11094,7 +10174,7 @@
                                     "While expanding the reference 'syscall_ptr' in:"
                                 ],
                                 "start_col": 19,
-                                "start_line": 30
+                                "start_line": 29
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -11102,7 +10182,7 @@
                         "start_line": 1
                     }
                 },
-                "435": {
+                "403": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -11120,7 +10200,7 @@
                         "parent_location": [
                             {
                                 "end_col": 65,
-                                "end_line": 30,
+                                "end_line": 29,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -11134,12 +10214,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 30,
+                                                "end_line": 29,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 30
+                                                "start_line": 29
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -11149,7 +10229,7 @@
                                     "While expanding the reference 'pedersen_ptr' in:"
                                 ],
                                 "start_col": 39,
-                                "start_line": 30
+                                "start_line": 29
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -11157,7 +10237,7 @@
                         "start_line": 1
                     }
                 },
-                "436": {
+                "404": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -11175,7 +10255,7 @@
                         "parent_location": [
                             {
                                 "end_col": 82,
-                                "end_line": 30,
+                                "end_line": 29,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -11189,12 +10269,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 30,
+                                                "end_line": 29,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 30
+                                                "start_line": 29
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -11204,7 +10284,7 @@
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
                                 "start_col": 67,
-                                "start_line": 30
+                                "start_line": 29
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -11212,7 +10292,7 @@
                         "start_line": 1
                     }
                 },
-                "437": {
+                "405": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -11223,15 +10303,15 @@
                     "hints": [],
                     "inst": {
                         "end_col": 18,
-                        "end_line": 30,
+                        "end_line": 29,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 6,
-                        "start_line": 30
+                        "start_line": 29
                     }
                 },
-                "439": {
+                "407": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -11249,7 +10329,7 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 30,
+                                "end_line": 29,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -11263,12 +10343,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 30,
+                                                "end_line": 29,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 30
+                                                "start_line": 29
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -11278,7 +10358,7 @@
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 30
+                                "start_line": 29
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -11286,7 +10366,7 @@
                         "start_line": 1
                     }
                 },
-                "440": {
+                "408": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -11304,12 +10384,12 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 30,
+                                "end_line": 29,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 30
+                                "start_line": 29
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -11317,7 +10397,7 @@
                         "start_line": 2
                     }
                 },
-                "442": {
+                "410": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -11335,7 +10415,7 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 30,
+                                "end_line": 29,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -11349,12 +10429,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 30,
+                                                "end_line": 29,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 30
+                                                "start_line": 29
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -11364,7 +10444,7 @@
                                     "While expanding the reference 'syscall_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 30
+                                "start_line": 29
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -11372,7 +10452,7 @@
                         "start_line": 1
                     }
                 },
-                "443": {
+                "411": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -11390,7 +10470,7 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 30,
+                                "end_line": 29,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -11404,12 +10484,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 30,
+                                                "end_line": 29,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 30
+                                                "start_line": 29
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -11419,7 +10499,7 @@
                                     "While expanding the reference 'pedersen_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 30
+                                "start_line": 29
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -11427,7 +10507,7 @@
                         "start_line": 1
                     }
                 },
-                "444": {
+                "412": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -11445,7 +10525,7 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 30,
+                                "end_line": 29,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -11459,12 +10539,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 30,
+                                                "end_line": 29,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 30
+                                                "start_line": 29
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -11474,7 +10554,7 @@
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 30
+                                "start_line": 29
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -11482,7 +10562,7 @@
                         "start_line": 2
                     }
                 },
-                "445": {
+                "413": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -11500,7 +10580,7 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 30,
+                                "end_line": 29,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -11514,12 +10594,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 30,
+                                                "end_line": 29,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 30
+                                                "start_line": 29
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -11529,7 +10609,7 @@
                                     "While expanding the reference 'ecdsa_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 30
+                                "start_line": 29
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -11537,7 +10617,7 @@
                         "start_line": 1
                     }
                 },
-                "446": {
+                "414": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -11555,7 +10635,7 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 30,
+                                "end_line": 29,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -11569,12 +10649,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 30,
+                                                "end_line": 29,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 30
+                                                "start_line": 29
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -11584,7 +10664,7 @@
                                     "While expanding the reference 'bitwise_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 30
+                                "start_line": 29
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -11592,7 +10672,7 @@
                         "start_line": 1
                     }
                 },
-                "447": {
+                "415": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -11610,7 +10690,7 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 30,
+                                "end_line": 29,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -11624,12 +10704,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 30,
+                                                "end_line": 29,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 30
+                                                "start_line": 29
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -11639,7 +10719,7 @@
                                     "While expanding the reference 'retdata_size' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 30
+                                "start_line": 29
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -11647,7 +10727,7 @@
                         "start_line": 2
                     }
                 },
-                "448": {
+                "416": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -11665,7 +10745,7 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 30,
+                                "end_line": 29,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -11679,12 +10759,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 30,
+                                                "end_line": 29,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 30
+                                                "start_line": 29
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -11694,7 +10774,7 @@
                                     "While expanding the reference 'retdata' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 30
+                                "start_line": 29
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -11702,7 +10782,7 @@
                         "start_line": 2
                     }
                 },
-                "449": {
+                "417": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -11720,12 +10800,12 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 30,
+                                "end_line": 29,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 30
+                                "start_line": 29
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -11733,7 +10813,7 @@
                         "start_line": 1
                     }
                 },
-                "450": {
+                "418": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -11743,39 +10823,39 @@
                     "hints": [],
                     "inst": {
                         "end_col": 42,
-                        "end_line": 38,
+                        "end_line": 37,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 47,
-                                "end_line": 17,
+                                "end_line": 91,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/introspection/erc165/library.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 50,
-                                        "end_line": 41,
+                                        "end_col": 51,
+                                        "end_line": 40,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 12,
-                                        "start_line": 41
+                                        "start_line": 40
                                     },
                                     "While trying to retrieve the implicit argument 'syscall_ptr' in:"
                                 ],
                                 "start_col": 29,
-                                "start_line": 17
+                                "start_line": 91
                             },
                             "While expanding the reference 'syscall_ptr' in:"
                         ],
                         "start_col": 24,
-                        "start_line": 38
+                        "start_line": 37
                     }
                 },
-                "451": {
+                "419": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -11785,39 +10865,39 @@
                     "hints": [],
                     "inst": {
                         "end_col": 70,
-                        "end_line": 38,
+                        "end_line": 37,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 75,
-                                "end_line": 17,
+                                "end_line": 91,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/introspection/erc165/library.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 50,
-                                        "end_line": 41,
+                                        "end_col": 51,
+                                        "end_line": 40,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 12,
-                                        "start_line": 41
+                                        "start_line": 40
                                     },
                                     "While trying to retrieve the implicit argument 'pedersen_ptr' in:"
                                 ],
                                 "start_col": 49,
-                                "start_line": 17
+                                "start_line": 91
                             },
                             "While expanding the reference 'pedersen_ptr' in:"
                         ],
                         "start_col": 44,
-                        "start_line": 38
+                        "start_line": 37
                     }
                 },
-                "452": {
+                "420": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -11827,39 +10907,39 @@
                     "hints": [],
                     "inst": {
                         "end_col": 87,
-                        "end_line": 38,
+                        "end_line": 37,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 92,
-                                "end_line": 17,
+                                "end_line": 91,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/introspection/erc165/library.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 50,
-                                        "end_line": 41,
+                                        "end_col": 51,
+                                        "end_line": 40,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 12,
-                                        "start_line": 41
+                                        "start_line": 40
                                     },
                                     "While trying to retrieve the implicit argument 'range_check_ptr' in:"
                                 ],
                                 "start_col": 77,
-                                "start_line": 17
+                                "start_line": 91
                             },
                             "While expanding the reference 'range_check_ptr' in:"
                         ],
                         "start_col": 72,
-                        "start_line": 38
+                        "start_line": 37
                     }
                 },
-                "453": {
+                "421": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -11869,27 +10949,27 @@
                     "hints": [],
                     "inst": {
                         "end_col": 22,
-                        "end_line": 39,
+                        "end_line": 38,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 49,
-                                "end_line": 41,
+                                "end_col": 50,
+                                "end_line": 40,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
-                                "start_col": 38,
-                                "start_line": 41
+                                "start_col": 39,
+                                "start_line": 40
                             },
                             "While expanding the reference 'interfaceId' in:"
                         ],
                         "start_col": 5,
-                        "start_line": 39
+                        "start_line": 38
                     }
                 },
-                "454": {
+                "422": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -11898,16 +10978,16 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 50,
-                        "end_line": 41,
+                        "end_col": 51,
+                        "end_line": 40,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 12,
-                        "start_line": 41
+                        "start_line": 40
                     }
                 },
-                "456": {
+                "424": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -11916,16 +10996,16 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 51,
-                        "end_line": 41,
+                        "end_col": 52,
+                        "end_line": 40,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 5,
-                        "start_line": 41
+                        "start_line": 40
                     }
                 },
-                "457": {
+                "425": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -11944,12 +11024,12 @@
                                 "parent_location": [
                                     {
                                         "end_col": 23,
-                                        "end_line": 38,
+                                        "end_line": 37,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 6,
-                                        "start_line": 38
+                                        "start_line": 37
                                     },
                                     "While handling return value of"
                                 ],
@@ -11968,12 +11048,12 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 38,
+                                "end_line": 37,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 38
+                                "start_line": 37
                             },
                             "While handling return value of"
                         ],
@@ -11981,7 +11061,7 @@
                         "start_line": 4
                     }
                 },
-                "459": {
+                "427": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -11999,12 +11079,12 @@
                         "parent_location": [
                             {
                                 "end_col": 20,
-                                "end_line": 40,
+                                "end_line": 39,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 7,
-                                "start_line": 40
+                                "start_line": 39
                             },
                             "While handling return value 'success'"
                         ],
@@ -12012,7 +11092,7 @@
                         "start_line": 1
                     }
                 },
-                "460": {
+                "428": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -12030,7 +11110,7 @@
                         "parent_location": [
                             {
                                 "end_col": 20,
-                                "end_line": 40,
+                                "end_line": 39,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -12044,12 +11124,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 23,
-                                                "end_line": 38,
+                                                "end_line": 37,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 38
+                                                "start_line": 37
                                             },
                                             "While handling return value of"
                                         ],
@@ -12059,7 +11139,7 @@
                                     "While expanding the reference '__return_value_ptr' in:"
                                 ],
                                 "start_col": 7,
-                                "start_line": 40
+                                "start_line": 39
                             },
                             "While handling return value 'success'"
                         ],
@@ -12067,7 +11147,7 @@
                         "start_line": 2
                     }
                 },
-                "462": {
+                "430": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -12085,7 +11165,7 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 38,
+                                "end_line": 37,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -12099,12 +11179,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 23,
-                                                "end_line": 38,
+                                                "end_line": 37,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 38
+                                                "start_line": 37
                                             },
                                             "While handling return value of"
                                         ],
@@ -12114,7 +11194,7 @@
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 38
+                                "start_line": 37
                             },
                             "While handling return value of"
                         ],
@@ -12122,7 +11202,7 @@
                         "start_line": 1
                     }
                 },
-                "463": {
+                "431": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -12140,12 +11220,12 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 38,
+                                "end_line": 37,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 38
+                                "start_line": 37
                             },
                             "While handling return value of"
                         ],
@@ -12153,7 +11233,7 @@
                         "start_line": 11
                     }
                 },
-                "464": {
+                "432": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -12171,7 +11251,7 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 38,
+                                "end_line": 37,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -12185,12 +11265,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 23,
-                                                "end_line": 38,
+                                                "end_line": 37,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 38
+                                                "start_line": 37
                                             },
                                             "While handling return value of"
                                         ],
@@ -12200,7 +11280,7 @@
                                     "While expanding the reference '__return_value_ptr_start' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 38
+                                "start_line": 37
                             },
                             "While handling return value of"
                         ],
@@ -12208,7 +11288,7 @@
                         "start_line": 5
                     }
                 },
-                "465": {
+                "433": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -12226,12 +11306,12 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 38,
+                                "end_line": 37,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 38
+                                "start_line": 37
                             },
                             "While handling return value of"
                         ],
@@ -12239,7 +11319,7 @@
                         "start_line": 9
                     }
                 },
-                "466": {
+                "434": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -12257,7 +11337,7 @@
                         "parent_location": [
                             {
                                 "end_col": 22,
-                                "end_line": 39,
+                                "end_line": 38,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -12271,7 +11351,7 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 23,
-                                                "end_line": 38,
+                                                "end_line": 37,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
@@ -12285,12 +11365,12 @@
                                                         "parent_location": [
                                                             {
                                                                 "end_col": 23,
-                                                                "end_line": 38,
+                                                                "end_line": 37,
                                                                 "input_file": {
                                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                                 },
                                                                 "start_col": 6,
-                                                                "start_line": 38
+                                                                "start_line": 37
                                                             },
                                                             "While handling calldata of"
                                                         ],
@@ -12300,7 +11380,7 @@
                                                     "While expanding the reference '__calldata_actual_size' in:"
                                                 ],
                                                 "start_col": 6,
-                                                "start_line": 38
+                                                "start_line": 37
                                             },
                                             "While handling calldata of"
                                         ],
@@ -12310,7 +11390,7 @@
                                     "While expanding the reference '__calldata_ptr' in:"
                                 ],
                                 "start_col": 5,
-                                "start_line": 39
+                                "start_line": 38
                             },
                             "While handling calldata argument 'interfaceId'"
                         ],
@@ -12318,7 +11398,7 @@
                         "start_line": 2
                     }
                 },
-                "468": {
+                "436": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -12336,12 +11416,12 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 38,
+                                "end_line": 37,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 38
+                                "start_line": 37
                             },
                             "While handling calldata of"
                         ],
@@ -12349,7 +11429,7 @@
                         "start_line": 1
                     }
                 },
-                "469": {
+                "437": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -12367,7 +11447,7 @@
                         "parent_location": [
                             {
                                 "end_col": 42,
-                                "end_line": 38,
+                                "end_line": 37,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -12381,12 +11461,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 23,
-                                                "end_line": 38,
+                                                "end_line": 37,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 38
+                                                "start_line": 37
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -12396,7 +11476,7 @@
                                     "While expanding the reference 'syscall_ptr' in:"
                                 ],
                                 "start_col": 24,
-                                "start_line": 38
+                                "start_line": 37
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -12404,7 +11484,7 @@
                         "start_line": 1
                     }
                 },
-                "470": {
+                "438": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -12422,7 +11502,7 @@
                         "parent_location": [
                             {
                                 "end_col": 70,
-                                "end_line": 38,
+                                "end_line": 37,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -12436,12 +11516,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 23,
-                                                "end_line": 38,
+                                                "end_line": 37,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 38
+                                                "start_line": 37
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -12451,7 +11531,7 @@
                                     "While expanding the reference 'pedersen_ptr' in:"
                                 ],
                                 "start_col": 44,
-                                "start_line": 38
+                                "start_line": 37
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -12459,7 +11539,7 @@
                         "start_line": 1
                     }
                 },
-                "471": {
+                "439": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -12477,7 +11557,7 @@
                         "parent_location": [
                             {
                                 "end_col": 87,
-                                "end_line": 38,
+                                "end_line": 37,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -12491,12 +11571,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 23,
-                                                "end_line": 38,
+                                                "end_line": 37,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 38
+                                                "start_line": 37
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -12506,7 +11586,7 @@
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
                                 "start_col": 72,
-                                "start_line": 38
+                                "start_line": 37
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -12514,7 +11594,7 @@
                         "start_line": 1
                     }
                 },
-                "472": {
+                "440": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -12532,7 +11612,7 @@
                         "parent_location": [
                             {
                                 "end_col": 22,
-                                "end_line": 39,
+                                "end_line": 38,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -12546,12 +11626,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 23,
-                                                "end_line": 38,
+                                                "end_line": 37,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 38
+                                                "start_line": 37
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -12561,7 +11641,7 @@
                                     "While expanding the reference '__calldata_arg_interfaceId' in:"
                                 ],
                                 "start_col": 5,
-                                "start_line": 39
+                                "start_line": 38
                             },
                             "While handling calldata argument 'interfaceId'"
                         ],
@@ -12569,7 +11649,7 @@
                         "start_line": 1
                     }
                 },
-                "473": {
+                "441": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -12580,15 +11660,15 @@
                     "hints": [],
                     "inst": {
                         "end_col": 23,
-                        "end_line": 38,
+                        "end_line": 37,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 6,
-                        "start_line": 38
+                        "start_line": 37
                     }
                 },
-                "475": {
+                "443": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -12606,7 +11686,7 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 38,
+                                "end_line": 37,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -12620,12 +11700,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 23,
-                                                "end_line": 38,
+                                                "end_line": 37,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 38
+                                                "start_line": 37
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -12635,7 +11715,7 @@
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 38
+                                "start_line": 37
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -12643,7 +11723,7 @@
                         "start_line": 1
                     }
                 },
-                "476": {
+                "444": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -12661,12 +11741,12 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 38,
+                                "end_line": 37,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 38
+                                "start_line": 37
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -12674,7 +11754,7 @@
                         "start_line": 2
                     }
                 },
-                "478": {
+                "446": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -12692,7 +11772,7 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 38,
+                                "end_line": 37,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -12706,12 +11786,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 23,
-                                                "end_line": 38,
+                                                "end_line": 37,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 38
+                                                "start_line": 37
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -12721,7 +11801,7 @@
                                     "While expanding the reference 'syscall_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 38
+                                "start_line": 37
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -12729,7 +11809,7 @@
                         "start_line": 1
                     }
                 },
-                "479": {
+                "447": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -12747,7 +11827,7 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 38,
+                                "end_line": 37,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -12761,12 +11841,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 23,
-                                                "end_line": 38,
+                                                "end_line": 37,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 38
+                                                "start_line": 37
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -12776,7 +11856,7 @@
                                     "While expanding the reference 'pedersen_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 38
+                                "start_line": 37
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -12784,7 +11864,7 @@
                         "start_line": 1
                     }
                 },
-                "480": {
+                "448": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -12802,7 +11882,7 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 38,
+                                "end_line": 37,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -12816,12 +11896,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 23,
-                                                "end_line": 38,
+                                                "end_line": 37,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 38
+                                                "start_line": 37
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -12831,7 +11911,7 @@
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 38
+                                "start_line": 37
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -12839,7 +11919,7 @@
                         "start_line": 2
                     }
                 },
-                "481": {
+                "449": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -12857,7 +11937,7 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 38,
+                                "end_line": 37,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -12871,12 +11951,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 23,
-                                                "end_line": 38,
+                                                "end_line": 37,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 38
+                                                "start_line": 37
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -12886,7 +11966,7 @@
                                     "While expanding the reference 'ecdsa_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 38
+                                "start_line": 37
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -12894,7 +11974,7 @@
                         "start_line": 1
                     }
                 },
-                "482": {
+                "450": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -12912,7 +11992,7 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 38,
+                                "end_line": 37,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -12926,12 +12006,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 23,
-                                                "end_line": 38,
+                                                "end_line": 37,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 38
+                                                "start_line": 37
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -12941,7 +12021,7 @@
                                     "While expanding the reference 'bitwise_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 38
+                                "start_line": 37
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -12949,7 +12029,7 @@
                         "start_line": 1
                     }
                 },
-                "483": {
+                "451": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -12967,7 +12047,7 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 38,
+                                "end_line": 37,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -12981,12 +12061,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 23,
-                                                "end_line": 38,
+                                                "end_line": 37,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 38
+                                                "start_line": 37
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -12996,7 +12076,7 @@
                                     "While expanding the reference 'retdata_size' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 38
+                                "start_line": 37
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -13004,7 +12084,7 @@
                         "start_line": 2
                     }
                 },
-                "484": {
+                "452": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -13022,7 +12102,7 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 38,
+                                "end_line": 37,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -13036,12 +12116,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 23,
-                                                "end_line": 38,
+                                                "end_line": 37,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 38
+                                                "start_line": 37
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -13051,7 +12131,7 @@
                                     "While expanding the reference 'retdata' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 38
+                                "start_line": 37
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -13059,7 +12139,7 @@
                         "start_line": 2
                     }
                 },
-                "485": {
+                "453": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -13077,12 +12157,12 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 38,
+                                "end_line": 37,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 38
+                                "start_line": 37
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -13090,7 +12170,7 @@
                         "start_line": 1
                     }
                 },
-                "486": {
+                "454": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -13100,39 +12180,39 @@
                     "hints": [],
                     "inst": {
                         "end_col": 37,
-                        "end_line": 49,
+                        "end_line": 48,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 43,
-                                "end_line": 92,
+                                "end_line": 107,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 41,
-                                        "end_line": 52,
+                                        "end_line": 51,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 5,
-                                        "start_line": 52
+                                        "start_line": 51
                                     },
                                     "While trying to retrieve the implicit argument 'syscall_ptr' in:"
                                 ],
                                 "start_col": 25,
-                                "start_line": 92
+                                "start_line": 107
                             },
                             "While expanding the reference 'syscall_ptr' in:"
                         ],
                         "start_col": 19,
-                        "start_line": 49
+                        "start_line": 48
                     }
                 },
-                "487": {
+                "455": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -13142,39 +12222,39 @@
                     "hints": [],
                     "inst": {
                         "end_col": 65,
-                        "end_line": 49,
+                        "end_line": 48,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 71,
-                                "end_line": 92,
+                                "end_line": 107,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 41,
-                                        "end_line": 52,
+                                        "end_line": 51,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 5,
-                                        "start_line": 52
+                                        "start_line": 51
                                     },
                                     "While trying to retrieve the implicit argument 'pedersen_ptr' in:"
                                 ],
                                 "start_col": 45,
-                                "start_line": 92
+                                "start_line": 107
                             },
                             "While expanding the reference 'pedersen_ptr' in:"
                         ],
                         "start_col": 39,
-                        "start_line": 49
+                        "start_line": 48
                     }
                 },
-                "488": {
+                "456": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -13184,39 +12264,39 @@
                     "hints": [],
                     "inst": {
                         "end_col": 82,
-                        "end_line": 49,
+                        "end_line": 48,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 88,
-                                "end_line": 92,
+                                "end_line": 107,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 41,
-                                        "end_line": 52,
+                                        "end_line": 51,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 5,
-                                        "start_line": 52
+                                        "start_line": 51
                                     },
                                     "While trying to retrieve the implicit argument 'range_check_ptr' in:"
                                 ],
                                 "start_col": 73,
-                                "start_line": 92
+                                "start_line": 107
                             },
                             "While expanding the reference 'range_check_ptr' in:"
                         ],
                         "start_col": 67,
-                        "start_line": 49
+                        "start_line": 48
                     }
                 },
-                "489": {
+                "457": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -13226,27 +12306,27 @@
                     "hints": [],
                     "inst": {
                         "end_col": 23,
-                        "end_line": 50,
+                        "end_line": 49,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 40,
-                                "end_line": 52,
+                                "end_line": 51,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 28,
-                                "start_line": 52
+                                "start_line": 51
                             },
                             "While expanding the reference 'newPublicKey' in:"
                         ],
                         "start_col": 5,
-                        "start_line": 50
+                        "start_line": 49
                     }
                 },
-                "490": {
+                "458": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -13256,15 +12336,15 @@
                     "hints": [],
                     "inst": {
                         "end_col": 41,
-                        "end_line": 52,
+                        "end_line": 51,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 5,
-                        "start_line": 52
+                        "start_line": 51
                     }
                 },
-                "492": {
+                "460": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -13274,15 +12354,15 @@
                     "hints": [],
                     "inst": {
                         "end_col": 15,
-                        "end_line": 53,
+                        "end_line": 52,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 5,
-                        "start_line": 53
+                        "start_line": 52
                     }
                 },
-                "493": {
+                "461": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -13300,7 +12380,7 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 50,
+                                "end_line": 49,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -13314,7 +12394,7 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 49,
+                                                "end_line": 48,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
@@ -13328,12 +12408,12 @@
                                                         "parent_location": [
                                                             {
                                                                 "end_col": 18,
-                                                                "end_line": 49,
+                                                                "end_line": 48,
                                                                 "input_file": {
                                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                                 },
                                                                 "start_col": 6,
-                                                                "start_line": 49
+                                                                "start_line": 48
                                                             },
                                                             "While handling calldata of"
                                                         ],
@@ -13343,7 +12423,7 @@
                                                     "While expanding the reference '__calldata_actual_size' in:"
                                                 ],
                                                 "start_col": 6,
-                                                "start_line": 49
+                                                "start_line": 48
                                             },
                                             "While handling calldata of"
                                         ],
@@ -13353,7 +12433,7 @@
                                     "While expanding the reference '__calldata_ptr' in:"
                                 ],
                                 "start_col": 5,
-                                "start_line": 50
+                                "start_line": 49
                             },
                             "While handling calldata argument 'newPublicKey'"
                         ],
@@ -13361,7 +12441,7 @@
                         "start_line": 2
                     }
                 },
-                "495": {
+                "463": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -13379,12 +12459,12 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 49,
+                                "end_line": 48,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 49
+                                "start_line": 48
                             },
                             "While handling calldata of"
                         ],
@@ -13392,7 +12472,7 @@
                         "start_line": 1
                     }
                 },
-                "496": {
+                "464": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -13410,7 +12490,7 @@
                         "parent_location": [
                             {
                                 "end_col": 37,
-                                "end_line": 49,
+                                "end_line": 48,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -13424,12 +12504,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 49,
+                                                "end_line": 48,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 49
+                                                "start_line": 48
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -13439,7 +12519,7 @@
                                     "While expanding the reference 'syscall_ptr' in:"
                                 ],
                                 "start_col": 19,
-                                "start_line": 49
+                                "start_line": 48
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -13447,7 +12527,7 @@
                         "start_line": 1
                     }
                 },
-                "497": {
+                "465": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -13465,7 +12545,7 @@
                         "parent_location": [
                             {
                                 "end_col": 65,
-                                "end_line": 49,
+                                "end_line": 48,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -13479,12 +12559,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 49,
+                                                "end_line": 48,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 49
+                                                "start_line": 48
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -13494,7 +12574,7 @@
                                     "While expanding the reference 'pedersen_ptr' in:"
                                 ],
                                 "start_col": 39,
-                                "start_line": 49
+                                "start_line": 48
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -13502,7 +12582,7 @@
                         "start_line": 1
                     }
                 },
-                "498": {
+                "466": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -13520,7 +12600,7 @@
                         "parent_location": [
                             {
                                 "end_col": 82,
-                                "end_line": 49,
+                                "end_line": 48,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -13534,12 +12614,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 49,
+                                                "end_line": 48,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 49
+                                                "start_line": 48
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -13549,7 +12629,7 @@
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
                                 "start_col": 67,
-                                "start_line": 49
+                                "start_line": 48
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -13557,7 +12637,7 @@
                         "start_line": 1
                     }
                 },
-                "499": {
+                "467": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -13575,7 +12655,7 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 50,
+                                "end_line": 49,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -13589,12 +12669,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 49,
+                                                "end_line": 48,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 49
+                                                "start_line": 48
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -13604,7 +12684,7 @@
                                     "While expanding the reference '__calldata_arg_newPublicKey' in:"
                                 ],
                                 "start_col": 5,
-                                "start_line": 50
+                                "start_line": 49
                             },
                             "While handling calldata argument 'newPublicKey'"
                         ],
@@ -13612,7 +12692,7 @@
                         "start_line": 1
                     }
                 },
-                "500": {
+                "468": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -13623,15 +12703,15 @@
                     "hints": [],
                     "inst": {
                         "end_col": 18,
-                        "end_line": 49,
+                        "end_line": 48,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 6,
-                        "start_line": 49
+                        "start_line": 48
                     }
                 },
-                "502": {
+                "470": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -13650,12 +12730,12 @@
                                 "parent_location": [
                                     {
                                         "end_col": 18,
-                                        "end_line": 49,
+                                        "end_line": 48,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 6,
-                                        "start_line": 49
+                                        "start_line": 48
                                     },
                                     "While constructing the external wrapper for:"
                                 ],
@@ -13674,12 +12754,12 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 49,
+                                "end_line": 48,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 49
+                                "start_line": 48
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -13687,7 +12767,7 @@
                         "start_line": 3
                     }
                 },
-                "504": {
+                "472": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -13705,7 +12785,7 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 49,
+                                "end_line": 48,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -13719,12 +12799,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 49,
+                                                "end_line": 48,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 49
+                                                "start_line": 48
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -13734,7 +12814,7 @@
                                     "While expanding the reference 'syscall_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 49
+                                "start_line": 48
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -13742,7 +12822,7 @@
                         "start_line": 1
                     }
                 },
-                "505": {
+                "473": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -13760,7 +12840,7 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 49,
+                                "end_line": 48,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -13774,12 +12854,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 49,
+                                                "end_line": 48,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 49
+                                                "start_line": 48
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -13789,7 +12869,7 @@
                                     "While expanding the reference 'pedersen_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 49
+                                "start_line": 48
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -13797,7 +12877,7 @@
                         "start_line": 1
                     }
                 },
-                "506": {
+                "474": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -13815,7 +12895,7 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 49,
+                                "end_line": 48,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -13829,12 +12909,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 49,
+                                                "end_line": 48,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 49
+                                                "start_line": 48
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -13844,7 +12924,7 @@
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 49
+                                "start_line": 48
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -13852,7 +12932,7 @@
                         "start_line": 1
                     }
                 },
-                "507": {
+                "475": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -13870,7 +12950,7 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 49,
+                                "end_line": 48,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -13884,12 +12964,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 49,
+                                                "end_line": 48,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 49
+                                                "start_line": 48
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -13899,7 +12979,7 @@
                                     "While expanding the reference 'ecdsa_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 49
+                                "start_line": 48
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -13907,7 +12987,7 @@
                         "start_line": 1
                     }
                 },
-                "508": {
+                "476": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -13925,7 +13005,7 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 49,
+                                "end_line": 48,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -13939,12 +13019,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 49,
+                                                "end_line": 48,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 49
+                                                "start_line": 48
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -13954,7 +13034,7 @@
                                     "While expanding the reference 'bitwise_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 49
+                                "start_line": 48
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -13962,7 +13042,7 @@
                         "start_line": 1
                     }
                 },
-                "509": {
+                "477": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -13980,7 +13060,7 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 49,
+                                "end_line": 48,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -13994,12 +13074,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 49,
+                                                "end_line": 48,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 49
+                                                "start_line": 48
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -14009,7 +13089,7 @@
                                     "While expanding the reference 'retdata_size' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 49
+                                "start_line": 48
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -14017,7 +13097,7 @@
                         "start_line": 4
                     }
                 },
-                "511": {
+                "479": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -14035,7 +13115,7 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 49,
+                                "end_line": 48,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -14049,12 +13129,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 49,
+                                                "end_line": 48,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 49
+                                                "start_line": 48
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -14064,7 +13144,7 @@
                                     "While expanding the reference 'retdata' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 49
+                                "start_line": 48
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -14072,7 +13152,7 @@
                         "start_line": 3
                     }
                 },
-                "512": {
+                "480": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -14090,12 +13170,12 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 49,
+                                "end_line": 48,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 49
+                                "start_line": 48
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -14103,7 +13183,7 @@
                         "start_line": 1
                     }
                 },
-                "513": {
+                "481": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -14113,39 +13193,39 @@
                     "hints": [],
                     "inst": {
                         "end_col": 23,
-                        "end_line": 62,
+                        "end_line": 61,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 27,
-                                "end_line": 105,
+                                "end_line": 120,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 85,
-                                        "end_line": 64,
+                                        "end_line": 63,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 27,
-                                        "start_line": 64
+                                        "start_line": 63
                                     },
                                     "While trying to retrieve the implicit argument 'syscall_ptr' in:"
                                 ],
                                 "start_col": 9,
-                                "start_line": 105
+                                "start_line": 120
                             },
                             "While expanding the reference 'syscall_ptr' in:"
                         ],
                         "start_col": 5,
-                        "start_line": 62
+                        "start_line": 61
                     }
                 },
-                "514": {
+                "482": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -14155,39 +13235,39 @@
                     "hints": [],
                     "inst": {
                         "end_col": 51,
-                        "end_line": 62,
+                        "end_line": 61,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 35,
-                                "end_line": 106,
+                                "end_line": 121,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 85,
-                                        "end_line": 64,
+                                        "end_line": 63,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 27,
-                                        "start_line": 64
+                                        "start_line": 63
                                     },
                                     "While trying to retrieve the implicit argument 'pedersen_ptr' in:"
                                 ],
                                 "start_col": 9,
-                                "start_line": 106
+                                "start_line": 121
                             },
                             "While expanding the reference 'pedersen_ptr' in:"
                         ],
                         "start_col": 25,
-                        "start_line": 62
+                        "start_line": 61
                     }
                 },
-                "515": {
+                "483": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -14196,40 +13276,40 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 68,
-                        "end_line": 62,
+                        "end_col": 81,
+                        "end_line": 61,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 24,
-                                "end_line": 107,
+                                "end_col": 37,
+                                "end_line": 122,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 85,
-                                        "end_line": 64,
+                                        "end_line": 63,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 27,
-                                        "start_line": 64
+                                        "start_line": 63
                                     },
-                                    "While trying to retrieve the implicit argument 'range_check_ptr' in:"
+                                    "While trying to retrieve the implicit argument 'ecdsa_ptr' in:"
                                 ],
                                 "start_col": 9,
-                                "start_line": 107
+                                "start_line": 122
                             },
-                            "While expanding the reference 'range_check_ptr' in:"
+                            "While expanding the reference 'ecdsa_ptr' in:"
                         ],
                         "start_col": 53,
-                        "start_line": 62
+                        "start_line": 61
                     }
                 },
-                "516": {
+                "484": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -14239,39 +13319,39 @@
                     "hints": [],
                     "inst": {
                         "end_col": 98,
-                        "end_line": 62,
+                        "end_line": 61,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 37,
-                                "end_line": 108,
+                                "end_col": 24,
+                                "end_line": 123,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 85,
-                                        "end_line": 64,
+                                        "end_line": 63,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 27,
-                                        "start_line": 64
+                                        "start_line": 63
                                     },
-                                    "While trying to retrieve the implicit argument 'ecdsa_ptr' in:"
+                                    "While trying to retrieve the implicit argument 'range_check_ptr' in:"
                                 ],
                                 "start_col": 9,
-                                "start_line": 108
+                                "start_line": 123
                             },
-                            "While expanding the reference 'ecdsa_ptr' in:"
+                            "While expanding the reference 'range_check_ptr' in:"
                         ],
-                        "start_col": 70,
-                        "start_line": 62
+                        "start_col": 83,
+                        "start_line": 61
                     }
                 },
-                "517": {
+                "485": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -14281,27 +13361,27 @@
                     "hints": [],
                     "inst": {
                         "end_col": 13,
-                        "end_line": 63,
+                        "end_line": 62,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 58,
-                                "end_line": 64,
+                                "end_line": 63,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 54,
-                                "start_line": 64
+                                "start_line": 63
                             },
                             "While expanding the reference 'hash' in:"
                         ],
                         "start_col": 3,
-                        "start_line": 63
+                        "start_line": 62
                     }
                 },
-                "518": {
+                "486": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -14311,27 +13391,27 @@
                     "hints": [],
                     "inst": {
                         "end_col": 34,
-                        "end_line": 63,
+                        "end_line": 62,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 73,
-                                "end_line": 64,
+                                "end_line": 63,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 60,
-                                "start_line": 64
+                                "start_line": 63
                             },
                             "While expanding the reference 'signature_len' in:"
                         ],
                         "start_col": 15,
-                        "start_line": 63
+                        "start_line": 62
                     }
                 },
-                "519": {
+                "487": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -14341,27 +13421,27 @@
                     "hints": [],
                     "inst": {
                         "end_col": 52,
-                        "end_line": 63,
+                        "end_line": 62,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 84,
-                                "end_line": 64,
+                                "end_line": 63,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 75,
-                                "start_line": 64
+                                "start_line": 63
                             },
                             "While expanding the reference 'signature' in:"
                         ],
                         "start_col": 36,
-                        "start_line": 63
+                        "start_line": 62
                     }
                 },
-                "520": {
+                "488": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -14371,15 +13451,15 @@
                     "hints": [],
                     "inst": {
                         "end_col": 85,
-                        "end_line": 64,
+                        "end_line": 63,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 27,
-                        "start_line": 64
+                        "start_line": 63
                     }
                 },
-                "522": {
+                "490": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -14388,16 +13468,16 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 29,
-                        "end_line": 65,
+                        "end_col": 30,
+                        "end_line": 64,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 5,
-                        "start_line": 65
+                        "start_line": 64
                     }
                 },
-                "523": {
+                "491": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -14416,12 +13496,12 @@
                                 "parent_location": [
                                     {
                                         "end_col": 22,
-                                        "end_line": 61,
+                                        "end_line": 60,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 6,
-                                        "start_line": 61
+                                        "start_line": 60
                                     },
                                     "While handling return value of"
                                 ],
@@ -14440,12 +13520,12 @@
                         "parent_location": [
                             {
                                 "end_col": 22,
-                                "end_line": 61,
+                                "end_line": 60,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 61
+                                "start_line": 60
                             },
                             "While handling return value of"
                         ],
@@ -14453,7 +13533,7 @@
                         "start_line": 4
                     }
                 },
-                "525": {
+                "493": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -14471,12 +13551,12 @@
                         "parent_location": [
                             {
                                 "end_col": 71,
-                                "end_line": 63,
+                                "end_line": 62,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 58,
-                                "start_line": 63
+                                "start_line": 62
                             },
                             "While handling return value 'isValid'"
                         ],
@@ -14484,7 +13564,7 @@
                         "start_line": 1
                     }
                 },
-                "526": {
+                "494": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -14502,7 +13582,7 @@
                         "parent_location": [
                             {
                                 "end_col": 71,
-                                "end_line": 63,
+                                "end_line": 62,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -14516,12 +13596,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 22,
-                                                "end_line": 61,
+                                                "end_line": 60,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 61
+                                                "start_line": 60
                                             },
                                             "While handling return value of"
                                         ],
@@ -14531,7 +13611,7 @@
                                     "While expanding the reference '__return_value_ptr' in:"
                                 ],
                                 "start_col": 58,
-                                "start_line": 63
+                                "start_line": 62
                             },
                             "While handling return value 'isValid'"
                         ],
@@ -14539,7 +13619,7 @@
                         "start_line": 2
                     }
                 },
-                "528": {
+                "496": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -14557,7 +13637,7 @@
                         "parent_location": [
                             {
                                 "end_col": 22,
-                                "end_line": 61,
+                                "end_line": 60,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -14571,12 +13651,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 22,
-                                                "end_line": 61,
+                                                "end_line": 60,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 61
+                                                "start_line": 60
                                             },
                                             "While handling return value of"
                                         ],
@@ -14586,7 +13666,7 @@
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 61
+                                "start_line": 60
                             },
                             "While handling return value of"
                         ],
@@ -14594,7 +13674,7 @@
                         "start_line": 1
                     }
                 },
-                "529": {
+                "497": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -14612,12 +13692,12 @@
                         "parent_location": [
                             {
                                 "end_col": 22,
-                                "end_line": 61,
+                                "end_line": 60,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 61
+                                "start_line": 60
                             },
                             "While handling return value of"
                         ],
@@ -14625,7 +13705,7 @@
                         "start_line": 11
                     }
                 },
-                "530": {
+                "498": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -14643,7 +13723,7 @@
                         "parent_location": [
                             {
                                 "end_col": 22,
-                                "end_line": 61,
+                                "end_line": 60,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -14657,12 +13737,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 22,
-                                                "end_line": 61,
+                                                "end_line": 60,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 61
+                                                "start_line": 60
                                             },
                                             "While handling return value of"
                                         ],
@@ -14672,7 +13752,7 @@
                                     "While expanding the reference '__return_value_ptr_start' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 61
+                                "start_line": 60
                             },
                             "While handling return value of"
                         ],
@@ -14680,7 +13760,7 @@
                         "start_line": 5
                     }
                 },
-                "531": {
+                "499": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -14698,12 +13778,12 @@
                         "parent_location": [
                             {
                                 "end_col": 22,
-                                "end_line": 61,
+                                "end_line": 60,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 61
+                                "start_line": 60
                             },
                             "While handling return value of"
                         ],
@@ -14711,7 +13791,7 @@
                         "start_line": 9
                     }
                 },
-                "532": {
+                "500": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -14728,8 +13808,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 68,
-                                "end_line": 62,
+                                "end_col": 98,
+                                "end_line": 61,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -14743,12 +13823,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 52,
-                                                "end_line": 63,
+                                                "end_line": 62,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 36,
-                                                "start_line": 63
+                                                "start_line": 62
                                             },
                                             "While handling calldata argument 'signature'"
                                         ],
@@ -14757,8 +13837,8 @@
                                     },
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
-                                "start_col": 53,
-                                "start_line": 62
+                                "start_col": 83,
+                                "start_line": 61
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -14766,7 +13846,7 @@
                         "start_line": 1
                     }
                 },
-                "533": {
+                "501": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -14784,7 +13864,7 @@
                         "parent_location": [
                             {
                                 "end_col": 34,
-                                "end_line": 63,
+                                "end_line": 62,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -14798,12 +13878,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 52,
-                                                "end_line": 63,
+                                                "end_line": 62,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 36,
-                                                "start_line": 63
+                                                "start_line": 62
                                             },
                                             "While handling calldata argument 'signature'"
                                         ],
@@ -14813,7 +13893,7 @@
                                     "While expanding the reference '__calldata_arg_signature_len' in:"
                                 ],
                                 "start_col": 15,
-                                "start_line": 63
+                                "start_line": 62
                             },
                             "While handling calldata argument 'signature_len'"
                         ],
@@ -14821,7 +13901,7 @@
                         "start_line": 1
                     }
                 },
-                "534": {
+                "502": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -14839,12 +13919,12 @@
                         "parent_location": [
                             {
                                 "end_col": 52,
-                                "end_line": 63,
+                                "end_line": 62,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 36,
-                                "start_line": 63
+                                "start_line": 62
                             },
                             "While handling calldata argument 'signature'"
                         ],
@@ -14852,7 +13932,7 @@
                         "start_line": 2
                     }
                 },
-                "535": {
+                "503": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -14870,7 +13950,7 @@
                         "parent_location": [
                             {
                                 "end_col": 34,
-                                "end_line": 63,
+                                "end_line": 62,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -14884,12 +13964,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 52,
-                                                "end_line": 63,
+                                                "end_line": 62,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 36,
-                                                "start_line": 63
+                                                "start_line": 62
                                             },
                                             "While handling calldata argument 'signature'"
                                         ],
@@ -14899,7 +13979,7 @@
                                     "While expanding the reference '__calldata_ptr' in:"
                                 ],
                                 "start_col": 15,
-                                "start_line": 63
+                                "start_line": 62
                             },
                             "While handling calldata argument 'signature_len'"
                         ],
@@ -14907,7 +13987,7 @@
                         "start_line": 2
                     }
                 },
-                "537": {
+                "505": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -14925,7 +14005,7 @@
                         "parent_location": [
                             {
                                 "end_col": 34,
-                                "end_line": 63,
+                                "end_line": 62,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -14939,12 +14019,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 52,
-                                                "end_line": 63,
+                                                "end_line": 62,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 36,
-                                                "start_line": 63
+                                                "start_line": 62
                                             },
                                             "While handling calldata argument 'signature'"
                                         ],
@@ -14954,7 +14034,7 @@
                                     "While expanding the reference '__calldata_arg_signature_len' in:"
                                 ],
                                 "start_col": 15,
-                                "start_line": 63
+                                "start_line": 62
                             },
                             "While handling calldata argument 'signature_len'"
                         ],
@@ -14962,7 +14042,7 @@
                         "start_line": 1
                     }
                 },
-                "538": {
+                "506": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -14980,12 +14060,12 @@
                         "parent_location": [
                             {
                                 "end_col": 52,
-                                "end_line": 63,
+                                "end_line": 62,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 36,
-                                "start_line": 63
+                                "start_line": 62
                             },
                             "While handling calldata argument 'signature'"
                         ],
@@ -14993,7 +14073,7 @@
                         "start_line": 8
                     }
                 },
-                "539": {
+                "507": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -15011,12 +14091,12 @@
                         "parent_location": [
                             {
                                 "end_col": 22,
-                                "end_line": 61,
+                                "end_line": 60,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 61
+                                "start_line": 60
                             },
                             "While handling calldata of"
                         ],
@@ -15024,7 +14104,7 @@
                         "start_line": 1
                     }
                 },
-                "540": {
+                "508": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -15041,8 +14121,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 68,
-                                "end_line": 62,
+                                "end_col": 98,
+                                "end_line": 61,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -15056,36 +14136,36 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 52,
-                                                "end_line": 63,
+                                                "end_line": 62,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "parent_location": [
                                                     {
-                                                        "end_col": 115,
+                                                        "end_col": 136,
                                                         "end_line": 1,
                                                         "input_file": {
-                                                            "filename": "autogen/starknet/external/isValidSignature/adf484e00673057feb7ddae544bf56c90ede82b41618516647b70e3ae5112edd.cairo"
+                                                            "filename": "autogen/starknet/external/isValidSignature/dc25ac1b979358bf96523ef3405d0b0d9c7820971d203cff2e2c75e545e055cc.cairo"
                                                         },
                                                         "parent_location": [
                                                             {
                                                                 "end_col": 22,
-                                                                "end_line": 61,
+                                                                "end_line": 60,
                                                                 "input_file": {
                                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                                 },
                                                                 "start_col": 6,
-                                                                "start_line": 61
+                                                                "start_line": 60
                                                             },
                                                             "While constructing the external wrapper for:"
                                                         ],
-                                                        "start_col": 100,
+                                                        "start_col": 121,
                                                         "start_line": 1
                                                     },
                                                     "While expanding the reference 'range_check_ptr' in:"
                                                 ],
                                                 "start_col": 36,
-                                                "start_line": 63
+                                                "start_line": 62
                                             },
                                             "While handling calldata argument 'signature'"
                                         ],
@@ -15094,8 +14174,8 @@
                                     },
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
-                                "start_col": 53,
-                                "start_line": 62
+                                "start_col": 83,
+                                "start_line": 61
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -15103,7 +14183,7 @@
                         "start_line": 1
                     }
                 },
-                "541": {
+                "509": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -15121,7 +14201,7 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 62,
+                                "end_line": 61,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -15130,17 +14210,17 @@
                                         "end_col": 55,
                                         "end_line": 1,
                                         "input_file": {
-                                            "filename": "autogen/starknet/external/isValidSignature/adf484e00673057feb7ddae544bf56c90ede82b41618516647b70e3ae5112edd.cairo"
+                                            "filename": "autogen/starknet/external/isValidSignature/dc25ac1b979358bf96523ef3405d0b0d9c7820971d203cff2e2c75e545e055cc.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 22,
-                                                "end_line": 61,
+                                                "end_line": 60,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 61
+                                                "start_line": 60
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -15150,7 +14230,7 @@
                                     "While expanding the reference 'syscall_ptr' in:"
                                 ],
                                 "start_col": 5,
-                                "start_line": 62
+                                "start_line": 61
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -15158,7 +14238,7 @@
                         "start_line": 1
                     }
                 },
-                "542": {
+                "510": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -15176,7 +14256,7 @@
                         "parent_location": [
                             {
                                 "end_col": 51,
-                                "end_line": 62,
+                                "end_line": 61,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -15185,17 +14265,17 @@
                                         "end_col": 82,
                                         "end_line": 1,
                                         "input_file": {
-                                            "filename": "autogen/starknet/external/isValidSignature/adf484e00673057feb7ddae544bf56c90ede82b41618516647b70e3ae5112edd.cairo"
+                                            "filename": "autogen/starknet/external/isValidSignature/dc25ac1b979358bf96523ef3405d0b0d9c7820971d203cff2e2c75e545e055cc.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 22,
-                                                "end_line": 61,
+                                                "end_line": 60,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 61
+                                                "start_line": 60
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -15205,7 +14285,7 @@
                                     "While expanding the reference 'pedersen_ptr' in:"
                                 ],
                                 "start_col": 25,
-                                "start_line": 62
+                                "start_line": 61
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -15213,7 +14293,7 @@
                         "start_line": 1
                     }
                 },
-                "543": {
+                "511": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -15223,52 +14303,52 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 42,
-                        "end_line": 3,
+                        "end_col": 112,
+                        "end_line": 1,
                         "input_file": {
-                            "filename": "autogen/starknet/arg_processor/8dcade045a914a94bd6d8ab9c7927a671c36ad8cecedb9f9ea763d7da696f3ef.cairo"
+                            "filename": "autogen/starknet/external/isValidSignature/972efe4adb0e1cedbdf0f0747cf1e121111a6180229de74773d49a6e595c4f3d.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 52,
-                                "end_line": 63,
+                                "end_col": 81,
+                                "end_line": 61,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 115,
+                                        "end_col": 103,
                                         "end_line": 1,
                                         "input_file": {
-                                            "filename": "autogen/starknet/external/isValidSignature/adf484e00673057feb7ddae544bf56c90ede82b41618516647b70e3ae5112edd.cairo"
+                                            "filename": "autogen/starknet/external/isValidSignature/dc25ac1b979358bf96523ef3405d0b0d9c7820971d203cff2e2c75e545e055cc.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 22,
-                                                "end_line": 61,
+                                                "end_line": 60,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 61
+                                                "start_line": 60
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
-                                        "start_col": 100,
+                                        "start_col": 94,
                                         "start_line": 1
                                     },
-                                    "While expanding the reference 'range_check_ptr' in:"
+                                    "While expanding the reference 'ecdsa_ptr' in:"
                                 ],
-                                "start_col": 36,
-                                "start_line": 63
+                                "start_col": 53,
+                                "start_line": 61
                             },
-                            "While handling calldata argument 'signature'"
+                            "While constructing the external wrapper for:"
                         ],
-                        "start_col": 23,
-                        "start_line": 3
+                        "start_col": 17,
+                        "start_line": 1
                     }
                 },
-                "545": {
+                "512": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -15278,14 +14358,14 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 112,
-                        "end_line": 1,
+                        "end_col": 42,
+                        "end_line": 3,
                         "input_file": {
-                            "filename": "autogen/starknet/external/isValidSignature/972efe4adb0e1cedbdf0f0747cf1e121111a6180229de74773d49a6e595c4f3d.cairo"
+                            "filename": "autogen/starknet/arg_processor/8dcade045a914a94bd6d8ab9c7927a671c36ad8cecedb9f9ea763d7da696f3ef.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 98,
+                                "end_col": 52,
                                 "end_line": 62,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
@@ -15295,35 +14375,35 @@
                                         "end_col": 136,
                                         "end_line": 1,
                                         "input_file": {
-                                            "filename": "autogen/starknet/external/isValidSignature/adf484e00673057feb7ddae544bf56c90ede82b41618516647b70e3ae5112edd.cairo"
+                                            "filename": "autogen/starknet/external/isValidSignature/dc25ac1b979358bf96523ef3405d0b0d9c7820971d203cff2e2c75e545e055cc.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 22,
-                                                "end_line": 61,
+                                                "end_line": 60,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 61
+                                                "start_line": 60
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
-                                        "start_col": 127,
+                                        "start_col": 121,
                                         "start_line": 1
                                     },
-                                    "While expanding the reference 'ecdsa_ptr' in:"
+                                    "While expanding the reference 'range_check_ptr' in:"
                                 ],
-                                "start_col": 70,
+                                "start_col": 36,
                                 "start_line": 62
                             },
-                            "While constructing the external wrapper for:"
+                            "While handling calldata argument 'signature'"
                         ],
-                        "start_col": 17,
-                        "start_line": 1
+                        "start_col": 23,
+                        "start_line": 3
                     }
                 },
-                "546": {
+                "514": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -15341,7 +14421,7 @@
                         "parent_location": [
                             {
                                 "end_col": 13,
-                                "end_line": 63,
+                                "end_line": 62,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -15350,17 +14430,17 @@
                                         "end_col": 162,
                                         "end_line": 1,
                                         "input_file": {
-                                            "filename": "autogen/starknet/external/isValidSignature/adf484e00673057feb7ddae544bf56c90ede82b41618516647b70e3ae5112edd.cairo"
+                                            "filename": "autogen/starknet/external/isValidSignature/dc25ac1b979358bf96523ef3405d0b0d9c7820971d203cff2e2c75e545e055cc.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 22,
-                                                "end_line": 61,
+                                                "end_line": 60,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 61
+                                                "start_line": 60
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -15370,7 +14450,7 @@
                                     "While expanding the reference '__calldata_arg_hash' in:"
                                 ],
                                 "start_col": 3,
-                                "start_line": 63
+                                "start_line": 62
                             },
                             "While handling calldata argument 'hash'"
                         ],
@@ -15378,7 +14458,7 @@
                         "start_line": 1
                     }
                 },
-                "547": {
+                "515": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -15396,7 +14476,7 @@
                         "parent_location": [
                             {
                                 "end_col": 34,
-                                "end_line": 63,
+                                "end_line": 62,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -15405,17 +14485,17 @@
                                         "end_col": 206,
                                         "end_line": 1,
                                         "input_file": {
-                                            "filename": "autogen/starknet/external/isValidSignature/adf484e00673057feb7ddae544bf56c90ede82b41618516647b70e3ae5112edd.cairo"
+                                            "filename": "autogen/starknet/external/isValidSignature/dc25ac1b979358bf96523ef3405d0b0d9c7820971d203cff2e2c75e545e055cc.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 22,
-                                                "end_line": 61,
+                                                "end_line": 60,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 61
+                                                "start_line": 60
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -15425,7 +14505,7 @@
                                     "While expanding the reference '__calldata_arg_signature_len' in:"
                                 ],
                                 "start_col": 15,
-                                "start_line": 63
+                                "start_line": 62
                             },
                             "While handling calldata argument 'signature_len'"
                         ],
@@ -15433,7 +14513,7 @@
                         "start_line": 1
                     }
                 },
-                "548": {
+                "516": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -15451,7 +14531,7 @@
                         "parent_location": [
                             {
                                 "end_col": 52,
-                                "end_line": 63,
+                                "end_line": 62,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -15460,17 +14540,17 @@
                                         "end_col": 242,
                                         "end_line": 1,
                                         "input_file": {
-                                            "filename": "autogen/starknet/external/isValidSignature/adf484e00673057feb7ddae544bf56c90ede82b41618516647b70e3ae5112edd.cairo"
+                                            "filename": "autogen/starknet/external/isValidSignature/dc25ac1b979358bf96523ef3405d0b0d9c7820971d203cff2e2c75e545e055cc.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 22,
-                                                "end_line": 61,
+                                                "end_line": 60,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 61
+                                                "start_line": 60
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -15480,7 +14560,7 @@
                                     "While expanding the reference '__calldata_arg_signature' in:"
                                 ],
                                 "start_col": 36,
-                                "start_line": 63
+                                "start_line": 62
                             },
                             "While handling calldata argument 'signature'"
                         ],
@@ -15488,7 +14568,7 @@
                         "start_line": 5
                     }
                 },
-                "550": {
+                "518": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -15499,15 +14579,15 @@
                     "hints": [],
                     "inst": {
                         "end_col": 22,
-                        "end_line": 61,
+                        "end_line": 60,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 6,
-                        "start_line": 61
+                        "start_line": 60
                     }
                 },
-                "552": {
+                "520": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -15517,15 +14597,15 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 115,
+                        "end_col": 136,
                         "end_line": 1,
                         "input_file": {
-                            "filename": "autogen/starknet/external/isValidSignature/adf484e00673057feb7ddae544bf56c90ede82b41618516647b70e3ae5112edd.cairo"
+                            "filename": "autogen/starknet/external/isValidSignature/dc25ac1b979358bf96523ef3405d0b0d9c7820971d203cff2e2c75e545e055cc.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 22,
-                                "end_line": 61,
+                                "end_line": 60,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -15534,17 +14614,17 @@
                                         "end_col": 105,
                                         "end_line": 2,
                                         "input_file": {
-                                            "filename": "autogen/starknet/external/isValidSignature/adf484e00673057feb7ddae544bf56c90ede82b41618516647b70e3ae5112edd.cairo"
+                                            "filename": "autogen/starknet/external/isValidSignature/dc25ac1b979358bf96523ef3405d0b0d9c7820971d203cff2e2c75e545e055cc.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 22,
-                                                "end_line": 61,
+                                                "end_line": 60,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 61
+                                                "start_line": 60
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -15554,15 +14634,15 @@
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 61
+                                "start_line": 60
                             },
                             "While constructing the external wrapper for:"
                         ],
-                        "start_col": 100,
+                        "start_col": 121,
                         "start_line": 1
                     }
                 },
-                "553": {
+                "521": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -15575,17 +14655,17 @@
                         "end_col": 106,
                         "end_line": 2,
                         "input_file": {
-                            "filename": "autogen/starknet/external/isValidSignature/adf484e00673057feb7ddae544bf56c90ede82b41618516647b70e3ae5112edd.cairo"
+                            "filename": "autogen/starknet/external/isValidSignature/dc25ac1b979358bf96523ef3405d0b0d9c7820971d203cff2e2c75e545e055cc.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 22,
-                                "end_line": 61,
+                                "end_line": 60,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 61
+                                "start_line": 60
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -15593,7 +14673,7 @@
                         "start_line": 2
                     }
                 },
-                "555": {
+                "523": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -15606,12 +14686,12 @@
                         "end_col": 55,
                         "end_line": 1,
                         "input_file": {
-                            "filename": "autogen/starknet/external/isValidSignature/adf484e00673057feb7ddae544bf56c90ede82b41618516647b70e3ae5112edd.cairo"
+                            "filename": "autogen/starknet/external/isValidSignature/dc25ac1b979358bf96523ef3405d0b0d9c7820971d203cff2e2c75e545e055cc.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 22,
-                                "end_line": 61,
+                                "end_line": 60,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -15625,12 +14705,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 22,
-                                                "end_line": 61,
+                                                "end_line": 60,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 61
+                                                "start_line": 60
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -15640,7 +14720,7 @@
                                     "While expanding the reference 'syscall_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 61
+                                "start_line": 60
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -15648,7 +14728,7 @@
                         "start_line": 1
                     }
                 },
-                "556": {
+                "524": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -15661,12 +14741,12 @@
                         "end_col": 82,
                         "end_line": 1,
                         "input_file": {
-                            "filename": "autogen/starknet/external/isValidSignature/adf484e00673057feb7ddae544bf56c90ede82b41618516647b70e3ae5112edd.cairo"
+                            "filename": "autogen/starknet/external/isValidSignature/dc25ac1b979358bf96523ef3405d0b0d9c7820971d203cff2e2c75e545e055cc.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 22,
-                                "end_line": 61,
+                                "end_line": 60,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -15680,12 +14760,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 22,
-                                                "end_line": 61,
+                                                "end_line": 60,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 61
+                                                "start_line": 60
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -15695,7 +14775,7 @@
                                     "While expanding the reference 'pedersen_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 61
+                                "start_line": 60
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -15703,7 +14783,7 @@
                         "start_line": 1
                     }
                 },
-                "557": {
+                "525": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -15716,12 +14796,12 @@
                         "end_col": 21,
                         "end_line": 2,
                         "input_file": {
-                            "filename": "autogen/starknet/external/isValidSignature/adf484e00673057feb7ddae544bf56c90ede82b41618516647b70e3ae5112edd.cairo"
+                            "filename": "autogen/starknet/external/isValidSignature/dc25ac1b979358bf96523ef3405d0b0d9c7820971d203cff2e2c75e545e055cc.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 22,
-                                "end_line": 61,
+                                "end_line": 60,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -15735,12 +14815,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 22,
-                                                "end_line": 61,
+                                                "end_line": 60,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 61
+                                                "start_line": 60
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -15750,7 +14830,7 @@
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 61
+                                "start_line": 60
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -15758,7 +14838,7 @@
                         "start_line": 2
                     }
                 },
-                "558": {
+                "526": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -15768,15 +14848,15 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 136,
+                        "end_col": 103,
                         "end_line": 1,
                         "input_file": {
-                            "filename": "autogen/starknet/external/isValidSignature/adf484e00673057feb7ddae544bf56c90ede82b41618516647b70e3ae5112edd.cairo"
+                            "filename": "autogen/starknet/external/isValidSignature/dc25ac1b979358bf96523ef3405d0b0d9c7820971d203cff2e2c75e545e055cc.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 22,
-                                "end_line": 61,
+                                "end_line": 60,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -15790,12 +14870,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 22,
-                                                "end_line": 61,
+                                                "end_line": 60,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 61
+                                                "start_line": 60
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -15805,15 +14885,15 @@
                                     "While expanding the reference 'ecdsa_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 61
+                                "start_line": 60
                             },
                             "While constructing the external wrapper for:"
                         ],
-                        "start_col": 127,
+                        "start_col": 94,
                         "start_line": 1
                     }
                 },
-                "559": {
+                "527": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -15831,7 +14911,7 @@
                         "parent_location": [
                             {
                                 "end_col": 22,
-                                "end_line": 61,
+                                "end_line": 60,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -15845,12 +14925,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 22,
-                                                "end_line": 61,
+                                                "end_line": 60,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 61
+                                                "start_line": 60
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -15860,7 +14940,7 @@
                                     "While expanding the reference 'bitwise_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 61
+                                "start_line": 60
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -15868,7 +14948,7 @@
                         "start_line": 1
                     }
                 },
-                "560": {
+                "528": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -15881,12 +14961,12 @@
                         "end_col": 35,
                         "end_line": 2,
                         "input_file": {
-                            "filename": "autogen/starknet/external/isValidSignature/adf484e00673057feb7ddae544bf56c90ede82b41618516647b70e3ae5112edd.cairo"
+                            "filename": "autogen/starknet/external/isValidSignature/dc25ac1b979358bf96523ef3405d0b0d9c7820971d203cff2e2c75e545e055cc.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 22,
-                                "end_line": 61,
+                                "end_line": 60,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -15900,12 +14980,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 22,
-                                                "end_line": 61,
+                                                "end_line": 60,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 61
+                                                "start_line": 60
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -15915,7 +14995,7 @@
                                     "While expanding the reference 'retdata_size' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 61
+                                "start_line": 60
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -15923,7 +15003,7 @@
                         "start_line": 2
                     }
                 },
-                "561": {
+                "529": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -15936,12 +15016,12 @@
                         "end_col": 44,
                         "end_line": 2,
                         "input_file": {
-                            "filename": "autogen/starknet/external/isValidSignature/adf484e00673057feb7ddae544bf56c90ede82b41618516647b70e3ae5112edd.cairo"
+                            "filename": "autogen/starknet/external/isValidSignature/dc25ac1b979358bf96523ef3405d0b0d9c7820971d203cff2e2c75e545e055cc.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 22,
-                                "end_line": 61,
+                                "end_line": 60,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -15955,12 +15035,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 22,
-                                                "end_line": 61,
+                                                "end_line": 60,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 61
+                                                "start_line": 60
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -15970,7 +15050,7 @@
                                     "While expanding the reference 'retdata' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 61
+                                "start_line": 60
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -15978,7 +15058,7 @@
                         "start_line": 2
                     }
                 },
-                "562": {
+                "530": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -15996,12 +15076,12 @@
                         "parent_location": [
                             {
                                 "end_col": 22,
-                                "end_line": 61,
+                                "end_line": 60,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 61
+                                "start_line": 60
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -16009,7 +15089,7 @@
                         "start_line": 1
                     }
                 },
-                "563": {
+                "531": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -16019,7 +15099,7 @@
                     "hints": [],
                     "inst": {
                         "end_col": 23,
-                        "end_line": 70,
+                        "end_line": 69,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
@@ -16028,17 +15108,17 @@
                                 "end_col": 36,
                                 "end_line": 438,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 34,
-                                        "end_line": 72,
+                                        "end_line": 71,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 21,
-                                        "start_line": 72
+                                        "start_line": 71
                                     },
                                     "While trying to retrieve the implicit argument 'syscall_ptr' in:"
                                 ],
@@ -16048,10 +15128,10 @@
                             "While expanding the reference 'syscall_ptr' in:"
                         ],
                         "start_col": 5,
-                        "start_line": 70
+                        "start_line": 69
                     }
                 },
-                "564": {
+                "532": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -16061,15 +15141,15 @@
                     "hints": [],
                     "inst": {
                         "end_col": 34,
-                        "end_line": 72,
+                        "end_line": 71,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 21,
-                        "start_line": 72
+                        "start_line": 71
                     }
                 },
-                "566": {
+                "534": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -16081,41 +15161,41 @@
                         "end_col": 36,
                         "end_line": 438,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 34,
-                                "end_line": 72,
+                                "end_line": 71,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 27,
-                                        "end_line": 105,
+                                        "end_line": 120,
                                         "input_file": {
-                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 99,
-                                                "end_line": 73,
+                                                "end_line": 72,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 5,
-                                                "start_line": 73
+                                                "start_line": 72
                                             },
                                             "While trying to retrieve the implicit argument 'syscall_ptr' in:"
                                         ],
                                         "start_col": 9,
-                                        "start_line": 105
+                                        "start_line": 120
                                     },
                                     "While expanding the reference 'syscall_ptr' in:"
                                 ],
                                 "start_col": 21,
-                                "start_line": 72
+                                "start_line": 71
                             },
                             "While trying to update the implicit return value 'syscall_ptr' in:"
                         ],
@@ -16123,7 +15203,7 @@
                         "start_line": 438
                     }
                 },
-                "567": {
+                "535": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -16133,39 +15213,39 @@
                     "hints": [],
                     "inst": {
                         "end_col": 51,
-                        "end_line": 70,
+                        "end_line": 69,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 35,
-                                "end_line": 106,
+                                "end_line": 121,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 99,
-                                        "end_line": 73,
+                                        "end_line": 72,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 5,
-                                        "start_line": 73
+                                        "start_line": 72
                                     },
                                     "While trying to retrieve the implicit argument 'pedersen_ptr' in:"
                                 ],
                                 "start_col": 9,
-                                "start_line": 106
+                                "start_line": 121
                             },
                             "While expanding the reference 'pedersen_ptr' in:"
                         ],
                         "start_col": 25,
-                        "start_line": 70
+                        "start_line": 69
                     }
                 },
-                "568": {
+                "536": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -16174,40 +15254,40 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 68,
-                        "end_line": 70,
+                        "end_col": 81,
+                        "end_line": 69,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 24,
-                                "end_line": 107,
+                                "end_col": 37,
+                                "end_line": 122,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 99,
-                                        "end_line": 73,
+                                        "end_line": 72,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 5,
-                                        "start_line": 73
+                                        "start_line": 72
                                     },
-                                    "While trying to retrieve the implicit argument 'range_check_ptr' in:"
+                                    "While trying to retrieve the implicit argument 'ecdsa_ptr' in:"
                                 ],
                                 "start_col": 9,
-                                "start_line": 107
+                                "start_line": 122
                             },
-                            "While expanding the reference 'range_check_ptr' in:"
+                            "While expanding the reference 'ecdsa_ptr' in:"
                         ],
                         "start_col": 53,
-                        "start_line": 70
+                        "start_line": 69
                     }
                 },
-                "569": {
+                "537": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -16217,39 +15297,39 @@
                     "hints": [],
                     "inst": {
                         "end_col": 98,
-                        "end_line": 70,
+                        "end_line": 69,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 37,
-                                "end_line": 108,
+                                "end_col": 24,
+                                "end_line": 123,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 99,
-                                        "end_line": 73,
+                                        "end_line": 72,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 5,
-                                        "start_line": 73
+                                        "start_line": 72
                                     },
-                                    "While trying to retrieve the implicit argument 'ecdsa_ptr' in:"
+                                    "While trying to retrieve the implicit argument 'range_check_ptr' in:"
                                 ],
                                 "start_col": 9,
-                                "start_line": 108
+                                "start_line": 123
                             },
-                            "While expanding the reference 'ecdsa_ptr' in:"
+                            "While expanding the reference 'range_check_ptr' in:"
                         ],
-                        "start_col": 70,
-                        "start_line": 70
+                        "start_col": 83,
+                        "start_line": 69
                     }
                 },
-                "570": {
+                "538": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -16259,15 +15339,15 @@
                     "hints": [],
                     "inst": {
                         "end_col": 56,
-                        "end_line": 73,
+                        "end_line": 72,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 32,
-                        "start_line": 73
+                        "start_line": 72
                     }
                 },
-                "571": {
+                "539": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -16277,15 +15357,15 @@
                     "hints": [],
                     "inst": {
                         "end_col": 79,
-                        "end_line": 73,
+                        "end_line": 72,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 58,
-                        "start_line": 73
+                        "start_line": 72
                     }
                 },
-                "572": {
+                "540": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -16295,15 +15375,15 @@
                     "hints": [],
                     "inst": {
                         "end_col": 98,
-                        "end_line": 73,
+                        "end_line": 72,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 81,
-                        "start_line": 73
+                        "start_line": 72
                     }
                 },
-                "573": {
+                "541": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -16313,15 +15393,15 @@
                     "hints": [],
                     "inst": {
                         "end_col": 99,
-                        "end_line": 73,
+                        "end_line": 72,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 5,
-                        "start_line": 73
+                        "start_line": 72
                     }
                 },
-                "575": {
+                "543": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -16331,51 +15411,51 @@
                     "hints": [],
                     "inst": {
                         "end_col": 27,
-                        "end_line": 105,
+                        "end_line": 120,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 99,
-                                "end_line": 73,
+                                "end_line": 72,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 23,
-                                        "end_line": 70,
+                                        "end_line": 69,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 15,
-                                                "end_line": 74,
+                                                "end_line": 73,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 5,
-                                                "start_line": 74
+                                                "start_line": 73
                                             },
                                             "While trying to retrieve the implicit argument 'syscall_ptr' in:"
                                         ],
                                         "start_col": 5,
-                                        "start_line": 70
+                                        "start_line": 69
                                     },
                                     "While expanding the reference 'syscall_ptr' in:"
                                 ],
                                 "start_col": 5,
-                                "start_line": 73
+                                "start_line": 72
                             },
                             "While trying to update the implicit return value 'syscall_ptr' in:"
                         ],
                         "start_col": 9,
-                        "start_line": 105
+                        "start_line": 120
                     }
                 },
-                "576": {
+                "544": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -16385,51 +15465,51 @@
                     "hints": [],
                     "inst": {
                         "end_col": 35,
-                        "end_line": 106,
+                        "end_line": 121,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 99,
-                                "end_line": 73,
+                                "end_line": 72,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 51,
-                                        "end_line": 70,
+                                        "end_line": 69,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 15,
-                                                "end_line": 74,
+                                                "end_line": 73,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 5,
-                                                "start_line": 74
+                                                "start_line": 73
                                             },
                                             "While trying to retrieve the implicit argument 'pedersen_ptr' in:"
                                         ],
                                         "start_col": 25,
-                                        "start_line": 70
+                                        "start_line": 69
                                     },
                                     "While expanding the reference 'pedersen_ptr' in:"
                                 ],
                                 "start_col": 5,
-                                "start_line": 73
+                                "start_line": 72
                             },
                             "While trying to update the implicit return value 'pedersen_ptr' in:"
                         ],
                         "start_col": 9,
-                        "start_line": 106
+                        "start_line": 121
                     }
                 },
-                "577": {
+                "545": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -16438,52 +15518,52 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 24,
-                        "end_line": 107,
+                        "end_col": 37,
+                        "end_line": 122,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 99,
-                                "end_line": 73,
+                                "end_line": 72,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 68,
-                                        "end_line": 70,
+                                        "end_col": 81,
+                                        "end_line": 69,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 15,
-                                                "end_line": 74,
+                                                "end_line": 73,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 5,
-                                                "start_line": 74
+                                                "start_line": 73
                                             },
-                                            "While trying to retrieve the implicit argument 'range_check_ptr' in:"
+                                            "While trying to retrieve the implicit argument 'ecdsa_ptr' in:"
                                         ],
                                         "start_col": 53,
-                                        "start_line": 70
+                                        "start_line": 69
                                     },
-                                    "While expanding the reference 'range_check_ptr' in:"
+                                    "While expanding the reference 'ecdsa_ptr' in:"
                                 ],
                                 "start_col": 5,
-                                "start_line": 73
+                                "start_line": 72
                             },
-                            "While trying to update the implicit return value 'range_check_ptr' in:"
+                            "While trying to update the implicit return value 'ecdsa_ptr' in:"
                         ],
                         "start_col": 9,
-                        "start_line": 107
+                        "start_line": 122
                     }
                 },
-                "578": {
+                "546": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -16492,52 +15572,52 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 37,
-                        "end_line": 108,
+                        "end_col": 24,
+                        "end_line": 123,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 99,
-                                "end_line": 73,
+                                "end_line": 72,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 98,
-                                        "end_line": 70,
+                                        "end_line": 69,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 15,
-                                                "end_line": 74,
+                                                "end_line": 73,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 5,
-                                                "start_line": 74
+                                                "start_line": 73
                                             },
-                                            "While trying to retrieve the implicit argument 'ecdsa_ptr' in:"
+                                            "While trying to retrieve the implicit argument 'range_check_ptr' in:"
                                         ],
-                                        "start_col": 70,
-                                        "start_line": 70
+                                        "start_col": 83,
+                                        "start_line": 69
                                     },
-                                    "While expanding the reference 'ecdsa_ptr' in:"
+                                    "While expanding the reference 'range_check_ptr' in:"
                                 ],
                                 "start_col": 5,
-                                "start_line": 73
+                                "start_line": 72
                             },
-                            "While trying to update the implicit return value 'ecdsa_ptr' in:"
+                            "While trying to update the implicit return value 'range_check_ptr' in:"
                         ],
                         "start_col": 9,
-                        "start_line": 108
+                        "start_line": 123
                     }
                 },
-                "579": {
+                "547": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -16547,15 +15627,15 @@
                     "hints": [],
                     "inst": {
                         "end_col": 15,
-                        "end_line": 74,
+                        "end_line": 73,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 5,
-                        "start_line": 74
+                        "start_line": 73
                     }
                 },
-                "580": {
+                "548": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -16572,8 +15652,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 68,
-                                "end_line": 70,
+                                "end_col": 98,
+                                "end_line": 69,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -16587,12 +15667,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 54,
-                                                "end_line": 71,
+                                                "end_line": 70,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 25,
-                                                "start_line": 71
+                                                "start_line": 70
                                             },
                                             "While handling calldata argument 'call_array'"
                                         ],
@@ -16601,8 +15681,8 @@
                                     },
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
-                                "start_col": 53,
-                                "start_line": 70
+                                "start_col": 83,
+                                "start_line": 69
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -16610,7 +15690,7 @@
                         "start_line": 1
                     }
                 },
-                "581": {
+                "549": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -16628,7 +15708,7 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 71,
+                                "end_line": 70,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -16642,12 +15722,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 54,
-                                                "end_line": 71,
+                                                "end_line": 70,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 25,
-                                                "start_line": 71
+                                                "start_line": 70
                                             },
                                             "While handling calldata argument 'call_array'"
                                         ],
@@ -16657,7 +15737,7 @@
                                     "While expanding the reference '__calldata_arg_call_array_len' in:"
                                 ],
                                 "start_col": 3,
-                                "start_line": 71
+                                "start_line": 70
                             },
                             "While handling calldata argument 'call_array_len'"
                         ],
@@ -16665,7 +15745,7 @@
                         "start_line": 1
                     }
                 },
-                "582": {
+                "550": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -16683,12 +15763,12 @@
                         "parent_location": [
                             {
                                 "end_col": 54,
-                                "end_line": 71,
+                                "end_line": 70,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 25,
-                                "start_line": 71
+                                "start_line": 70
                             },
                             "While handling calldata argument 'call_array'"
                         ],
@@ -16696,7 +15776,7 @@
                         "start_line": 2
                     }
                 },
-                "583": {
+                "551": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -16714,7 +15794,7 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 71,
+                                "end_line": 70,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -16728,12 +15808,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 54,
-                                                "end_line": 71,
+                                                "end_line": 70,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 25,
-                                                "start_line": 71
+                                                "start_line": 70
                                             },
                                             "While handling calldata argument 'call_array'"
                                         ],
@@ -16743,7 +15823,7 @@
                                     "While expanding the reference '__calldata_ptr' in:"
                                 ],
                                 "start_col": 3,
-                                "start_line": 71
+                                "start_line": 70
                             },
                             "While handling calldata argument 'call_array_len'"
                         ],
@@ -16751,7 +15831,7 @@
                         "start_line": 2
                     }
                 },
-                "585": {
+                "553": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -16769,7 +15849,7 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 71,
+                                "end_line": 70,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -16783,12 +15863,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 54,
-                                                "end_line": 71,
+                                                "end_line": 70,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 25,
-                                                "start_line": 71
+                                                "start_line": 70
                                             },
                                             "While handling calldata argument 'call_array'"
                                         ],
@@ -16798,7 +15878,7 @@
                                     "While expanding the reference '__calldata_arg_call_array_len' in:"
                                 ],
                                 "start_col": 3,
-                                "start_line": 71
+                                "start_line": 70
                             },
                             "While handling calldata argument 'call_array_len'"
                         ],
@@ -16806,7 +15886,7 @@
                         "start_line": 1
                     }
                 },
-                "586": {
+                "554": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -16824,12 +15904,12 @@
                         "parent_location": [
                             {
                                 "end_col": 54,
-                                "end_line": 71,
+                                "end_line": 70,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 25,
-                                "start_line": 71
+                                "start_line": 70
                             },
                             "While handling calldata argument 'call_array'"
                         ],
@@ -16837,7 +15917,7 @@
                         "start_line": 8
                     }
                 },
-                "588": {
+                "556": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -16855,12 +15935,12 @@
                         "parent_location": [
                             {
                                 "end_col": 54,
-                                "end_line": 71,
+                                "end_line": 70,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 25,
-                                "start_line": 71
+                                "start_line": 70
                             },
                             "While handling calldata argument 'call_array'"
                         ],
@@ -16868,7 +15948,7 @@
                         "start_line": 8
                     }
                 },
-                "589": {
+                "557": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -16885,8 +15965,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 68,
-                                "end_line": 70,
+                                "end_col": 98,
+                                "end_line": 69,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -16900,7 +15980,7 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 54,
-                                                "end_line": 71,
+                                                "end_line": 70,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
@@ -16914,12 +15994,12 @@
                                                         "parent_location": [
                                                             {
                                                                 "end_col": 91,
-                                                                "end_line": 71,
+                                                                "end_line": 70,
                                                                 "input_file": {
                                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                                 },
                                                                 "start_col": 76,
-                                                                "start_line": 71
+                                                                "start_line": 70
                                                             },
                                                             "While handling calldata argument 'calldata'"
                                                         ],
@@ -16929,7 +16009,7 @@
                                                     "While expanding the reference 'range_check_ptr' in:"
                                                 ],
                                                 "start_col": 25,
-                                                "start_line": 71
+                                                "start_line": 70
                                             },
                                             "While handling calldata argument 'call_array'"
                                         ],
@@ -16938,8 +16018,8 @@
                                     },
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
-                                "start_col": 53,
-                                "start_line": 70
+                                "start_col": 83,
+                                "start_line": 69
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -16947,7 +16027,7 @@
                         "start_line": 1
                     }
                 },
-                "590": {
+                "558": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -16965,7 +16045,7 @@
                         "parent_location": [
                             {
                                 "end_col": 74,
-                                "end_line": 71,
+                                "end_line": 70,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -16979,12 +16059,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 91,
-                                                "end_line": 71,
+                                                "end_line": 70,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 76,
-                                                "start_line": 71
+                                                "start_line": 70
                                             },
                                             "While handling calldata argument 'calldata'"
                                         ],
@@ -16994,7 +16074,7 @@
                                     "While expanding the reference '__calldata_arg_calldata_len' in:"
                                 ],
                                 "start_col": 56,
-                                "start_line": 71
+                                "start_line": 70
                             },
                             "While handling calldata argument 'calldata_len'"
                         ],
@@ -17002,7 +16082,7 @@
                         "start_line": 1
                     }
                 },
-                "591": {
+                "559": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -17020,12 +16100,12 @@
                         "parent_location": [
                             {
                                 "end_col": 91,
-                                "end_line": 71,
+                                "end_line": 70,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 76,
-                                "start_line": 71
+                                "start_line": 70
                             },
                             "While handling calldata argument 'calldata'"
                         ],
@@ -17033,7 +16113,7 @@
                         "start_line": 2
                     }
                 },
-                "592": {
+                "560": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -17051,7 +16131,7 @@
                         "parent_location": [
                             {
                                 "end_col": 74,
-                                "end_line": 71,
+                                "end_line": 70,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -17065,12 +16145,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 91,
-                                                "end_line": 71,
+                                                "end_line": 70,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 76,
-                                                "start_line": 71
+                                                "start_line": 70
                                             },
                                             "While handling calldata argument 'calldata'"
                                         ],
@@ -17080,7 +16160,7 @@
                                     "While expanding the reference '__calldata_ptr' in:"
                                 ],
                                 "start_col": 56,
-                                "start_line": 71
+                                "start_line": 70
                             },
                             "While handling calldata argument 'calldata_len'"
                         ],
@@ -17088,7 +16168,7 @@
                         "start_line": 2
                     }
                 },
-                "594": {
+                "562": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -17106,7 +16186,7 @@
                         "parent_location": [
                             {
                                 "end_col": 74,
-                                "end_line": 71,
+                                "end_line": 70,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -17120,12 +16200,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 91,
-                                                "end_line": 71,
+                                                "end_line": 70,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 76,
-                                                "start_line": 71
+                                                "start_line": 70
                                             },
                                             "While handling calldata argument 'calldata'"
                                         ],
@@ -17135,7 +16215,7 @@
                                     "While expanding the reference '__calldata_arg_calldata_len' in:"
                                 ],
                                 "start_col": 56,
-                                "start_line": 71
+                                "start_line": 70
                             },
                             "While handling calldata argument 'calldata_len'"
                         ],
@@ -17143,7 +16223,7 @@
                         "start_line": 1
                     }
                 },
-                "595": {
+                "563": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -17161,12 +16241,12 @@
                         "parent_location": [
                             {
                                 "end_col": 91,
-                                "end_line": 71,
+                                "end_line": 70,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 76,
-                                "start_line": 71
+                                "start_line": 70
                             },
                             "While handling calldata argument 'calldata'"
                         ],
@@ -17174,7 +16254,7 @@
                         "start_line": 8
                     }
                 },
-                "596": {
+                "564": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -17192,12 +16272,12 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 69,
+                                "end_line": 68,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 69
+                                "start_line": 68
                             },
                             "While handling calldata of"
                         ],
@@ -17205,7 +16285,7 @@
                         "start_line": 1
                     }
                 },
-                "597": {
+                "565": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -17222,8 +16302,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 68,
-                                "end_line": 70,
+                                "end_col": 98,
+                                "end_line": 69,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -17237,7 +16317,7 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 54,
-                                                "end_line": 71,
+                                                "end_line": 70,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
@@ -17251,36 +16331,36 @@
                                                         "parent_location": [
                                                             {
                                                                 "end_col": 91,
-                                                                "end_line": 71,
+                                                                "end_line": 70,
                                                                 "input_file": {
                                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                                 },
                                                                 "parent_location": [
                                                                     {
-                                                                        "end_col": 115,
+                                                                        "end_col": 136,
                                                                         "end_line": 1,
                                                                         "input_file": {
-                                                                            "filename": "autogen/starknet/external/__validate__/87b73a6c2103aa9b2a7045f08168455c63774c534d3319c05b0c50234b021a50.cairo"
+                                                                            "filename": "autogen/starknet/external/__validate__/883be30acb6a1330d51bfd10cbcbff897d747444eaacd9630821b0430bd22dc4.cairo"
                                                                         },
                                                                         "parent_location": [
                                                                             {
                                                                                 "end_col": 18,
-                                                                                "end_line": 69,
+                                                                                "end_line": 68,
                                                                                 "input_file": {
                                                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                                                 },
                                                                                 "start_col": 6,
-                                                                                "start_line": 69
+                                                                                "start_line": 68
                                                                             },
                                                                             "While constructing the external wrapper for:"
                                                                         ],
-                                                                        "start_col": 100,
+                                                                        "start_col": 121,
                                                                         "start_line": 1
                                                                     },
                                                                     "While expanding the reference 'range_check_ptr' in:"
                                                                 ],
                                                                 "start_col": 76,
-                                                                "start_line": 71
+                                                                "start_line": 70
                                                             },
                                                             "While handling calldata argument 'calldata'"
                                                         ],
@@ -17290,7 +16370,7 @@
                                                     "While expanding the reference 'range_check_ptr' in:"
                                                 ],
                                                 "start_col": 25,
-                                                "start_line": 71
+                                                "start_line": 70
                                             },
                                             "While handling calldata argument 'call_array'"
                                         ],
@@ -17299,8 +16379,8 @@
                                     },
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
-                                "start_col": 53,
-                                "start_line": 70
+                                "start_col": 83,
+                                "start_line": 69
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -17308,7 +16388,7 @@
                         "start_line": 1
                     }
                 },
-                "598": {
+                "566": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -17326,7 +16406,7 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 70,
+                                "end_line": 69,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -17335,17 +16415,17 @@
                                         "end_col": 55,
                                         "end_line": 1,
                                         "input_file": {
-                                            "filename": "autogen/starknet/external/__validate__/87b73a6c2103aa9b2a7045f08168455c63774c534d3319c05b0c50234b021a50.cairo"
+                                            "filename": "autogen/starknet/external/__validate__/883be30acb6a1330d51bfd10cbcbff897d747444eaacd9630821b0430bd22dc4.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 69,
+                                                "end_line": 68,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 69
+                                                "start_line": 68
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -17355,7 +16435,7 @@
                                     "While expanding the reference 'syscall_ptr' in:"
                                 ],
                                 "start_col": 5,
-                                "start_line": 70
+                                "start_line": 69
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -17363,7 +16443,7 @@
                         "start_line": 1
                     }
                 },
-                "599": {
+                "567": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -17381,7 +16461,7 @@
                         "parent_location": [
                             {
                                 "end_col": 51,
-                                "end_line": 70,
+                                "end_line": 69,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -17390,17 +16470,17 @@
                                         "end_col": 82,
                                         "end_line": 1,
                                         "input_file": {
-                                            "filename": "autogen/starknet/external/__validate__/87b73a6c2103aa9b2a7045f08168455c63774c534d3319c05b0c50234b021a50.cairo"
+                                            "filename": "autogen/starknet/external/__validate__/883be30acb6a1330d51bfd10cbcbff897d747444eaacd9630821b0430bd22dc4.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 69,
+                                                "end_line": 68,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 69
+                                                "start_line": 68
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -17410,7 +16490,7 @@
                                     "While expanding the reference 'pedersen_ptr' in:"
                                 ],
                                 "start_col": 25,
-                                "start_line": 70
+                                "start_line": 69
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -17418,7 +16498,7 @@
                         "start_line": 1
                     }
                 },
-                "600": {
+                "568": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -17428,52 +16508,52 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 42,
-                        "end_line": 3,
+                        "end_col": 112,
+                        "end_line": 1,
                         "input_file": {
-                            "filename": "autogen/starknet/arg_processor/60a1d0127411d0a1f9a364f5245ae52da8e752ea42edf6ddaf5217c8bdeb8bad.cairo"
+                            "filename": "autogen/starknet/external/__validate__/972efe4adb0e1cedbdf0f0747cf1e121111a6180229de74773d49a6e595c4f3d.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 91,
-                                "end_line": 71,
+                                "end_col": 81,
+                                "end_line": 69,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 115,
+                                        "end_col": 103,
                                         "end_line": 1,
                                         "input_file": {
-                                            "filename": "autogen/starknet/external/__validate__/87b73a6c2103aa9b2a7045f08168455c63774c534d3319c05b0c50234b021a50.cairo"
+                                            "filename": "autogen/starknet/external/__validate__/883be30acb6a1330d51bfd10cbcbff897d747444eaacd9630821b0430bd22dc4.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 69,
+                                                "end_line": 68,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 69
+                                                "start_line": 68
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
-                                        "start_col": 100,
+                                        "start_col": 94,
                                         "start_line": 1
                                     },
-                                    "While expanding the reference 'range_check_ptr' in:"
+                                    "While expanding the reference 'ecdsa_ptr' in:"
                                 ],
-                                "start_col": 76,
-                                "start_line": 71
+                                "start_col": 53,
+                                "start_line": 69
                             },
-                            "While handling calldata argument 'calldata'"
+                            "While constructing the external wrapper for:"
                         ],
-                        "start_col": 23,
-                        "start_line": 3
+                        "start_col": 17,
+                        "start_line": 1
                     }
                 },
-                "602": {
+                "569": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -17483,14 +16563,14 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 112,
-                        "end_line": 1,
+                        "end_col": 42,
+                        "end_line": 3,
                         "input_file": {
-                            "filename": "autogen/starknet/external/__validate__/972efe4adb0e1cedbdf0f0747cf1e121111a6180229de74773d49a6e595c4f3d.cairo"
+                            "filename": "autogen/starknet/arg_processor/60a1d0127411d0a1f9a364f5245ae52da8e752ea42edf6ddaf5217c8bdeb8bad.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 98,
+                                "end_col": 91,
                                 "end_line": 70,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
@@ -17500,35 +16580,35 @@
                                         "end_col": 136,
                                         "end_line": 1,
                                         "input_file": {
-                                            "filename": "autogen/starknet/external/__validate__/87b73a6c2103aa9b2a7045f08168455c63774c534d3319c05b0c50234b021a50.cairo"
+                                            "filename": "autogen/starknet/external/__validate__/883be30acb6a1330d51bfd10cbcbff897d747444eaacd9630821b0430bd22dc4.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 69,
+                                                "end_line": 68,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 69
+                                                "start_line": 68
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
-                                        "start_col": 127,
+                                        "start_col": 121,
                                         "start_line": 1
                                     },
-                                    "While expanding the reference 'ecdsa_ptr' in:"
+                                    "While expanding the reference 'range_check_ptr' in:"
                                 ],
-                                "start_col": 70,
+                                "start_col": 76,
                                 "start_line": 70
                             },
-                            "While constructing the external wrapper for:"
+                            "While handling calldata argument 'calldata'"
                         ],
-                        "start_col": 17,
-                        "start_line": 1
+                        "start_col": 23,
+                        "start_line": 3
                     }
                 },
-                "603": {
+                "571": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -17546,7 +16626,7 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 71,
+                                "end_line": 70,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -17555,17 +16635,17 @@
                                         "end_col": 182,
                                         "end_line": 1,
                                         "input_file": {
-                                            "filename": "autogen/starknet/external/__validate__/87b73a6c2103aa9b2a7045f08168455c63774c534d3319c05b0c50234b021a50.cairo"
+                                            "filename": "autogen/starknet/external/__validate__/883be30acb6a1330d51bfd10cbcbff897d747444eaacd9630821b0430bd22dc4.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 69,
+                                                "end_line": 68,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 69
+                                                "start_line": 68
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -17575,7 +16655,7 @@
                                     "While expanding the reference '__calldata_arg_call_array_len' in:"
                                 ],
                                 "start_col": 3,
-                                "start_line": 71
+                                "start_line": 70
                             },
                             "While handling calldata argument 'call_array_len'"
                         ],
@@ -17583,7 +16663,7 @@
                         "start_line": 1
                     }
                 },
-                "604": {
+                "572": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -17601,7 +16681,7 @@
                         "parent_location": [
                             {
                                 "end_col": 54,
-                                "end_line": 71,
+                                "end_line": 70,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -17610,17 +16690,17 @@
                                         "end_col": 220,
                                         "end_line": 1,
                                         "input_file": {
-                                            "filename": "autogen/starknet/external/__validate__/87b73a6c2103aa9b2a7045f08168455c63774c534d3319c05b0c50234b021a50.cairo"
+                                            "filename": "autogen/starknet/external/__validate__/883be30acb6a1330d51bfd10cbcbff897d747444eaacd9630821b0430bd22dc4.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 69,
+                                                "end_line": 68,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 69
+                                                "start_line": 68
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -17630,7 +16710,7 @@
                                     "While expanding the reference '__calldata_arg_call_array' in:"
                                 ],
                                 "start_col": 25,
-                                "start_line": 71
+                                "start_line": 70
                             },
                             "While handling calldata argument 'call_array'"
                         ],
@@ -17638,7 +16718,7 @@
                         "start_line": 5
                     }
                 },
-                "606": {
+                "574": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -17656,7 +16736,7 @@
                         "parent_location": [
                             {
                                 "end_col": 74,
-                                "end_line": 71,
+                                "end_line": 70,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -17665,17 +16745,17 @@
                                         "end_col": 262,
                                         "end_line": 1,
                                         "input_file": {
-                                            "filename": "autogen/starknet/external/__validate__/87b73a6c2103aa9b2a7045f08168455c63774c534d3319c05b0c50234b021a50.cairo"
+                                            "filename": "autogen/starknet/external/__validate__/883be30acb6a1330d51bfd10cbcbff897d747444eaacd9630821b0430bd22dc4.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 69,
+                                                "end_line": 68,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 69
+                                                "start_line": 68
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -17685,7 +16765,7 @@
                                     "While expanding the reference '__calldata_arg_calldata_len' in:"
                                 ],
                                 "start_col": 56,
-                                "start_line": 71
+                                "start_line": 70
                             },
                             "While handling calldata argument 'calldata_len'"
                         ],
@@ -17693,7 +16773,7 @@
                         "start_line": 1
                     }
                 },
-                "607": {
+                "575": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -17711,7 +16791,7 @@
                         "parent_location": [
                             {
                                 "end_col": 91,
-                                "end_line": 71,
+                                "end_line": 70,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -17720,17 +16800,17 @@
                                         "end_col": 296,
                                         "end_line": 1,
                                         "input_file": {
-                                            "filename": "autogen/starknet/external/__validate__/87b73a6c2103aa9b2a7045f08168455c63774c534d3319c05b0c50234b021a50.cairo"
+                                            "filename": "autogen/starknet/external/__validate__/883be30acb6a1330d51bfd10cbcbff897d747444eaacd9630821b0430bd22dc4.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 69,
+                                                "end_line": 68,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 69
+                                                "start_line": 68
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -17740,7 +16820,7 @@
                                     "While expanding the reference '__calldata_arg_calldata' in:"
                                 ],
                                 "start_col": 76,
-                                "start_line": 71
+                                "start_line": 70
                             },
                             "While handling calldata argument 'calldata'"
                         ],
@@ -17748,7 +16828,7 @@
                         "start_line": 5
                     }
                 },
-                "609": {
+                "577": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -17759,15 +16839,15 @@
                     "hints": [],
                     "inst": {
                         "end_col": 18,
-                        "end_line": 69,
+                        "end_line": 68,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 6,
-                        "start_line": 69
+                        "start_line": 68
                     }
                 },
-                "611": {
+                "579": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -17781,17 +16861,17 @@
                                 "end_col": 34,
                                 "end_line": 2,
                                 "input_file": {
-                                    "filename": "autogen/starknet/external/__validate__/87b73a6c2103aa9b2a7045f08168455c63774c534d3319c05b0c50234b021a50.cairo"
+                                    "filename": "autogen/starknet/external/__validate__/883be30acb6a1330d51bfd10cbcbff897d747444eaacd9630821b0430bd22dc4.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 18,
-                                        "end_line": 69,
+                                        "end_line": 68,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 6,
-                                        "start_line": 69
+                                        "start_line": 68
                                     },
                                     "While constructing the external wrapper for:"
                                 ],
@@ -17805,17 +16885,17 @@
                         "end_col": 24,
                         "end_line": 3,
                         "input_file": {
-                            "filename": "autogen/starknet/external/__validate__/87b73a6c2103aa9b2a7045f08168455c63774c534d3319c05b0c50234b021a50.cairo"
+                            "filename": "autogen/starknet/external/__validate__/883be30acb6a1330d51bfd10cbcbff897d747444eaacd9630821b0430bd22dc4.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 69,
+                                "end_line": 68,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 69
+                                "start_line": 68
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -17823,7 +16903,7 @@
                         "start_line": 3
                     }
                 },
-                "613": {
+                "581": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -17836,12 +16916,12 @@
                         "end_col": 55,
                         "end_line": 1,
                         "input_file": {
-                            "filename": "autogen/starknet/external/__validate__/87b73a6c2103aa9b2a7045f08168455c63774c534d3319c05b0c50234b021a50.cairo"
+                            "filename": "autogen/starknet/external/__validate__/883be30acb6a1330d51bfd10cbcbff897d747444eaacd9630821b0430bd22dc4.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 69,
+                                "end_line": 68,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -17855,12 +16935,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 69,
+                                                "end_line": 68,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 69
+                                                "start_line": 68
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -17870,7 +16950,7 @@
                                     "While expanding the reference 'syscall_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 69
+                                "start_line": 68
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -17878,7 +16958,7 @@
                         "start_line": 1
                     }
                 },
-                "614": {
+                "582": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -17891,12 +16971,12 @@
                         "end_col": 82,
                         "end_line": 1,
                         "input_file": {
-                            "filename": "autogen/starknet/external/__validate__/87b73a6c2103aa9b2a7045f08168455c63774c534d3319c05b0c50234b021a50.cairo"
+                            "filename": "autogen/starknet/external/__validate__/883be30acb6a1330d51bfd10cbcbff897d747444eaacd9630821b0430bd22dc4.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 69,
+                                "end_line": 68,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -17910,12 +16990,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 69,
+                                                "end_line": 68,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 69
+                                                "start_line": 68
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -17925,7 +17005,7 @@
                                     "While expanding the reference 'pedersen_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 69
+                                "start_line": 68
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -17933,7 +17013,7 @@
                         "start_line": 1
                     }
                 },
-                "615": {
+                "583": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -17943,15 +17023,15 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 115,
+                        "end_col": 136,
                         "end_line": 1,
                         "input_file": {
-                            "filename": "autogen/starknet/external/__validate__/87b73a6c2103aa9b2a7045f08168455c63774c534d3319c05b0c50234b021a50.cairo"
+                            "filename": "autogen/starknet/external/__validate__/883be30acb6a1330d51bfd10cbcbff897d747444eaacd9630821b0430bd22dc4.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 69,
+                                "end_line": 68,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -17965,12 +17045,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 69,
+                                                "end_line": 68,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 69
+                                                "start_line": 68
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -17980,15 +17060,15 @@
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 69
+                                "start_line": 68
                             },
                             "While constructing the external wrapper for:"
                         ],
-                        "start_col": 100,
+                        "start_col": 121,
                         "start_line": 1
                     }
                 },
-                "616": {
+                "584": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -17998,15 +17078,15 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 136,
+                        "end_col": 103,
                         "end_line": 1,
                         "input_file": {
-                            "filename": "autogen/starknet/external/__validate__/87b73a6c2103aa9b2a7045f08168455c63774c534d3319c05b0c50234b021a50.cairo"
+                            "filename": "autogen/starknet/external/__validate__/883be30acb6a1330d51bfd10cbcbff897d747444eaacd9630821b0430bd22dc4.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 69,
+                                "end_line": 68,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -18020,12 +17100,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 69,
+                                                "end_line": 68,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 69
+                                                "start_line": 68
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -18035,15 +17115,15 @@
                                     "While expanding the reference 'ecdsa_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 69
+                                "start_line": 68
                             },
                             "While constructing the external wrapper for:"
                         ],
-                        "start_col": 127,
+                        "start_col": 94,
                         "start_line": 1
                     }
                 },
-                "617": {
+                "585": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -18061,7 +17141,7 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 69,
+                                "end_line": 68,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -18075,12 +17155,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 69,
+                                                "end_line": 68,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 69
+                                                "start_line": 68
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -18090,7 +17170,7 @@
                                     "While expanding the reference 'bitwise_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 69
+                                "start_line": 68
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -18098,7 +17178,7 @@
                         "start_line": 1
                     }
                 },
-                "618": {
+                "586": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -18111,12 +17191,12 @@
                         "end_col": 21,
                         "end_line": 4,
                         "input_file": {
-                            "filename": "autogen/starknet/external/__validate__/87b73a6c2103aa9b2a7045f08168455c63774c534d3319c05b0c50234b021a50.cairo"
+                            "filename": "autogen/starknet/external/__validate__/883be30acb6a1330d51bfd10cbcbff897d747444eaacd9630821b0430bd22dc4.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 69,
+                                "end_line": 68,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -18130,12 +17210,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 69,
+                                                "end_line": 68,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 69
+                                                "start_line": 68
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -18145,7 +17225,7 @@
                                     "While expanding the reference 'retdata_size' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 69
+                                "start_line": 68
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -18153,7 +17233,7 @@
                         "start_line": 4
                     }
                 },
-                "620": {
+                "588": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -18166,12 +17246,12 @@
                         "end_col": 16,
                         "end_line": 3,
                         "input_file": {
-                            "filename": "autogen/starknet/external/__validate__/87b73a6c2103aa9b2a7045f08168455c63774c534d3319c05b0c50234b021a50.cairo"
+                            "filename": "autogen/starknet/external/__validate__/883be30acb6a1330d51bfd10cbcbff897d747444eaacd9630821b0430bd22dc4.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 69,
+                                "end_line": 68,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -18185,12 +17265,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 69,
+                                                "end_line": 68,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 69
+                                                "start_line": 68
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -18200,7 +17280,7 @@
                                     "While expanding the reference 'retdata' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 69
+                                "start_line": 68
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -18208,7 +17288,7 @@
                         "start_line": 3
                     }
                 },
-                "621": {
+                "589": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -18226,12 +17306,12 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 69,
+                                "end_line": 68,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 69
+                                "start_line": 68
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -18239,7 +17319,7 @@
                         "start_line": 1
                     }
                 },
-                "622": {
+                "590": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -18249,7 +17329,7 @@
                     "hints": [],
                     "inst": {
                         "end_col": 23,
-                        "end_line": 79,
+                        "end_line": 78,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
@@ -18258,17 +17338,17 @@
                                 "end_col": 36,
                                 "end_line": 438,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 34,
-                                        "end_line": 81,
+                                        "end_line": 80,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 21,
-                                        "start_line": 81
+                                        "start_line": 80
                                     },
                                     "While trying to retrieve the implicit argument 'syscall_ptr' in:"
                                 ],
@@ -18278,10 +17358,10 @@
                             "While expanding the reference 'syscall_ptr' in:"
                         ],
                         "start_col": 5,
-                        "start_line": 79
+                        "start_line": 78
                     }
                 },
-                "623": {
+                "591": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -18291,15 +17371,15 @@
                     "hints": [],
                     "inst": {
                         "end_col": 34,
-                        "end_line": 81,
+                        "end_line": 80,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 21,
-                        "start_line": 81
+                        "start_line": 80
                     }
                 },
-                "625": {
+                "593": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -18311,41 +17391,41 @@
                         "end_col": 36,
                         "end_line": 438,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 34,
-                                "end_line": 81,
+                                "end_line": 80,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 27,
-                                        "end_line": 105,
+                                        "end_line": 120,
                                         "input_file": {
-                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 99,
-                                                "end_line": 82,
+                                                "end_line": 81,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 5,
-                                                "start_line": 82
+                                                "start_line": 81
                                             },
                                             "While trying to retrieve the implicit argument 'syscall_ptr' in:"
                                         ],
                                         "start_col": 9,
-                                        "start_line": 105
+                                        "start_line": 120
                                     },
                                     "While expanding the reference 'syscall_ptr' in:"
                                 ],
                                 "start_col": 21,
-                                "start_line": 81
+                                "start_line": 80
                             },
                             "While trying to update the implicit return value 'syscall_ptr' in:"
                         ],
@@ -18353,7 +17433,7 @@
                         "start_line": 438
                     }
                 },
-                "626": {
+                "594": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -18363,39 +17443,39 @@
                     "hints": [],
                     "inst": {
                         "end_col": 51,
-                        "end_line": 79,
+                        "end_line": 78,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 35,
-                                "end_line": 106,
+                                "end_line": 121,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 99,
-                                        "end_line": 82,
+                                        "end_line": 81,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 5,
-                                        "start_line": 82
+                                        "start_line": 81
                                     },
                                     "While trying to retrieve the implicit argument 'pedersen_ptr' in:"
                                 ],
                                 "start_col": 9,
-                                "start_line": 106
+                                "start_line": 121
                             },
                             "While expanding the reference 'pedersen_ptr' in:"
                         ],
                         "start_col": 25,
-                        "start_line": 79
+                        "start_line": 78
                     }
                 },
-                "627": {
+                "595": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -18404,40 +17484,40 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 68,
-                        "end_line": 79,
+                        "end_col": 81,
+                        "end_line": 78,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 24,
-                                "end_line": 107,
+                                "end_col": 37,
+                                "end_line": 122,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 99,
-                                        "end_line": 82,
+                                        "end_line": 81,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 5,
-                                        "start_line": 82
+                                        "start_line": 81
                                     },
-                                    "While trying to retrieve the implicit argument 'range_check_ptr' in:"
+                                    "While trying to retrieve the implicit argument 'ecdsa_ptr' in:"
                                 ],
                                 "start_col": 9,
-                                "start_line": 107
+                                "start_line": 122
                             },
-                            "While expanding the reference 'range_check_ptr' in:"
+                            "While expanding the reference 'ecdsa_ptr' in:"
                         ],
                         "start_col": 53,
-                        "start_line": 79
+                        "start_line": 78
                     }
                 },
-                "628": {
+                "596": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -18447,39 +17527,39 @@
                     "hints": [],
                     "inst": {
                         "end_col": 98,
-                        "end_line": 79,
+                        "end_line": 78,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 37,
-                                "end_line": 108,
+                                "end_col": 24,
+                                "end_line": 123,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 99,
-                                        "end_line": 82,
+                                        "end_line": 81,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 5,
-                                        "start_line": 82
+                                        "start_line": 81
                                     },
-                                    "While trying to retrieve the implicit argument 'ecdsa_ptr' in:"
+                                    "While trying to retrieve the implicit argument 'range_check_ptr' in:"
                                 ],
                                 "start_col": 9,
-                                "start_line": 108
+                                "start_line": 123
                             },
-                            "While expanding the reference 'ecdsa_ptr' in:"
+                            "While expanding the reference 'range_check_ptr' in:"
                         ],
-                        "start_col": 70,
-                        "start_line": 79
+                        "start_col": 83,
+                        "start_line": 78
                     }
                 },
-                "629": {
+                "597": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -18489,15 +17569,15 @@
                     "hints": [],
                     "inst": {
                         "end_col": 56,
-                        "end_line": 82,
+                        "end_line": 81,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 32,
-                        "start_line": 82
+                        "start_line": 81
                     }
                 },
-                "630": {
+                "598": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -18507,15 +17587,15 @@
                     "hints": [],
                     "inst": {
                         "end_col": 79,
-                        "end_line": 82,
+                        "end_line": 81,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 58,
-                        "start_line": 82
+                        "start_line": 81
                     }
                 },
-                "631": {
+                "599": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -18525,15 +17605,15 @@
                     "hints": [],
                     "inst": {
                         "end_col": 98,
-                        "end_line": 82,
+                        "end_line": 81,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 81,
-                        "start_line": 82
+                        "start_line": 81
                     }
                 },
-                "632": {
+                "600": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -18543,15 +17623,15 @@
                     "hints": [],
                     "inst": {
                         "end_col": 99,
-                        "end_line": 82,
+                        "end_line": 81,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 5,
-                        "start_line": 82
+                        "start_line": 81
                     }
                 },
-                "634": {
+                "602": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -18561,51 +17641,51 @@
                     "hints": [],
                     "inst": {
                         "end_col": 27,
-                        "end_line": 105,
+                        "end_line": 120,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 99,
-                                "end_line": 82,
+                                "end_line": 81,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 23,
-                                        "end_line": 79,
+                                        "end_line": 78,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 15,
-                                                "end_line": 83,
+                                                "end_line": 82,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 5,
-                                                "start_line": 83
+                                                "start_line": 82
                                             },
                                             "While trying to retrieve the implicit argument 'syscall_ptr' in:"
                                         ],
                                         "start_col": 5,
-                                        "start_line": 79
+                                        "start_line": 78
                                     },
                                     "While expanding the reference 'syscall_ptr' in:"
                                 ],
                                 "start_col": 5,
-                                "start_line": 82
+                                "start_line": 81
                             },
                             "While trying to update the implicit return value 'syscall_ptr' in:"
                         ],
                         "start_col": 9,
-                        "start_line": 105
+                        "start_line": 120
                     }
                 },
-                "635": {
+                "603": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -18615,51 +17695,51 @@
                     "hints": [],
                     "inst": {
                         "end_col": 35,
-                        "end_line": 106,
+                        "end_line": 121,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 99,
-                                "end_line": 82,
+                                "end_line": 81,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 51,
-                                        "end_line": 79,
+                                        "end_line": 78,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 15,
-                                                "end_line": 83,
+                                                "end_line": 82,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 5,
-                                                "start_line": 83
+                                                "start_line": 82
                                             },
                                             "While trying to retrieve the implicit argument 'pedersen_ptr' in:"
                                         ],
                                         "start_col": 25,
-                                        "start_line": 79
+                                        "start_line": 78
                                     },
                                     "While expanding the reference 'pedersen_ptr' in:"
                                 ],
                                 "start_col": 5,
-                                "start_line": 82
+                                "start_line": 81
                             },
                             "While trying to update the implicit return value 'pedersen_ptr' in:"
                         ],
                         "start_col": 9,
-                        "start_line": 106
+                        "start_line": 121
                     }
                 },
-                "636": {
+                "604": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -18668,52 +17748,52 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 24,
-                        "end_line": 107,
+                        "end_col": 37,
+                        "end_line": 122,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 99,
-                                "end_line": 82,
+                                "end_line": 81,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 68,
-                                        "end_line": 79,
+                                        "end_col": 81,
+                                        "end_line": 78,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 15,
-                                                "end_line": 83,
+                                                "end_line": 82,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 5,
-                                                "start_line": 83
+                                                "start_line": 82
                                             },
-                                            "While trying to retrieve the implicit argument 'range_check_ptr' in:"
+                                            "While trying to retrieve the implicit argument 'ecdsa_ptr' in:"
                                         ],
                                         "start_col": 53,
-                                        "start_line": 79
+                                        "start_line": 78
                                     },
-                                    "While expanding the reference 'range_check_ptr' in:"
+                                    "While expanding the reference 'ecdsa_ptr' in:"
                                 ],
                                 "start_col": 5,
-                                "start_line": 82
+                                "start_line": 81
                             },
-                            "While trying to update the implicit return value 'range_check_ptr' in:"
+                            "While trying to update the implicit return value 'ecdsa_ptr' in:"
                         ],
                         "start_col": 9,
-                        "start_line": 107
+                        "start_line": 122
                     }
                 },
-                "637": {
+                "605": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -18722,52 +17802,52 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 37,
-                        "end_line": 108,
+                        "end_col": 24,
+                        "end_line": 123,
                         "input_file": {
-                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 99,
-                                "end_line": 82,
+                                "end_line": 81,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 98,
-                                        "end_line": 79,
+                                        "end_line": 78,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 15,
-                                                "end_line": 83,
+                                                "end_line": 82,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 5,
-                                                "start_line": 83
+                                                "start_line": 82
                                             },
-                                            "While trying to retrieve the implicit argument 'ecdsa_ptr' in:"
+                                            "While trying to retrieve the implicit argument 'range_check_ptr' in:"
                                         ],
-                                        "start_col": 70,
-                                        "start_line": 79
+                                        "start_col": 83,
+                                        "start_line": 78
                                     },
-                                    "While expanding the reference 'ecdsa_ptr' in:"
+                                    "While expanding the reference 'range_check_ptr' in:"
                                 ],
                                 "start_col": 5,
-                                "start_line": 82
+                                "start_line": 81
                             },
-                            "While trying to update the implicit return value 'ecdsa_ptr' in:"
+                            "While trying to update the implicit return value 'range_check_ptr' in:"
                         ],
                         "start_col": 9,
-                        "start_line": 108
+                        "start_line": 123
                     }
                 },
-                "638": {
+                "606": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -18777,15 +17857,15 @@
                     "hints": [],
                     "inst": {
                         "end_col": 15,
-                        "end_line": 83,
+                        "end_line": 82,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 5,
-                        "start_line": 83
+                        "start_line": 82
                     }
                 },
-                "639": {
+                "607": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -18803,7 +17883,7 @@
                         "parent_location": [
                             {
                                 "end_col": 19,
-                                "end_line": 80,
+                                "end_line": 79,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -18817,7 +17897,7 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 26,
-                                                "end_line": 78,
+                                                "end_line": 77,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
@@ -18831,12 +17911,12 @@
                                                         "parent_location": [
                                                             {
                                                                 "end_col": 26,
-                                                                "end_line": 78,
+                                                                "end_line": 77,
                                                                 "input_file": {
                                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                                 },
                                                                 "start_col": 6,
-                                                                "start_line": 78
+                                                                "start_line": 77
                                                             },
                                                             "While handling calldata of"
                                                         ],
@@ -18846,7 +17926,7 @@
                                                     "While expanding the reference '__calldata_actual_size' in:"
                                                 ],
                                                 "start_col": 6,
-                                                "start_line": 78
+                                                "start_line": 77
                                             },
                                             "While handling calldata of"
                                         ],
@@ -18856,7 +17936,7 @@
                                     "While expanding the reference '__calldata_ptr' in:"
                                 ],
                                 "start_col": 3,
-                                "start_line": 80
+                                "start_line": 79
                             },
                             "While handling calldata argument 'class_hash'"
                         ],
@@ -18864,7 +17944,7 @@
                         "start_line": 2
                     }
                 },
-                "641": {
+                "609": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -18882,12 +17962,12 @@
                         "parent_location": [
                             {
                                 "end_col": 26,
-                                "end_line": 78,
+                                "end_line": 77,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 78
+                                "start_line": 77
                             },
                             "While handling calldata of"
                         ],
@@ -18895,7 +17975,7 @@
                         "start_line": 1
                     }
                 },
-                "642": {
+                "610": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -18913,7 +17993,7 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 79,
+                                "end_line": 78,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -18922,17 +18002,17 @@
                                         "end_col": 55,
                                         "end_line": 1,
                                         "input_file": {
-                                            "filename": "autogen/starknet/external/__validate_declare__/11e948d40597e98e975bf01626a4e8f9d0c95d23c5581719df49f99529b2abf9.cairo"
+                                            "filename": "autogen/starknet/external/__validate_declare__/aeb171d2cc305f87c40b0407565ecdd1a4c396c46cd94f15ca0069e15eab01ed.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 26,
-                                                "end_line": 78,
+                                                "end_line": 77,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 78
+                                                "start_line": 77
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -18942,7 +18022,7 @@
                                     "While expanding the reference 'syscall_ptr' in:"
                                 ],
                                 "start_col": 5,
-                                "start_line": 79
+                                "start_line": 78
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -18950,7 +18030,7 @@
                         "start_line": 1
                     }
                 },
-                "643": {
+                "611": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -18968,7 +18048,7 @@
                         "parent_location": [
                             {
                                 "end_col": 51,
-                                "end_line": 79,
+                                "end_line": 78,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -18977,17 +18057,17 @@
                                         "end_col": 82,
                                         "end_line": 1,
                                         "input_file": {
-                                            "filename": "autogen/starknet/external/__validate_declare__/11e948d40597e98e975bf01626a4e8f9d0c95d23c5581719df49f99529b2abf9.cairo"
+                                            "filename": "autogen/starknet/external/__validate_declare__/aeb171d2cc305f87c40b0407565ecdd1a4c396c46cd94f15ca0069e15eab01ed.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 26,
-                                                "end_line": 78,
+                                                "end_line": 77,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 78
+                                                "start_line": 77
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -18997,7 +18077,7 @@
                                     "While expanding the reference 'pedersen_ptr' in:"
                                 ],
                                 "start_col": 25,
-                                "start_line": 79
+                                "start_line": 78
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -19005,7 +18085,7 @@
                         "start_line": 1
                     }
                 },
-                "644": {
+                "612": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -19015,52 +18095,52 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 67,
+                        "end_col": 112,
                         "end_line": 1,
                         "input_file": {
-                            "filename": "autogen/starknet/external/__validate_declare__/741ea357d6336b0bed7bf0472425acd0311d543883b803388880e60a232040c7.cairo"
+                            "filename": "autogen/starknet/external/__validate_declare__/972efe4adb0e1cedbdf0f0747cf1e121111a6180229de74773d49a6e595c4f3d.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 68,
-                                "end_line": 79,
+                                "end_col": 81,
+                                "end_line": 78,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 115,
+                                        "end_col": 103,
                                         "end_line": 1,
                                         "input_file": {
-                                            "filename": "autogen/starknet/external/__validate_declare__/11e948d40597e98e975bf01626a4e8f9d0c95d23c5581719df49f99529b2abf9.cairo"
+                                            "filename": "autogen/starknet/external/__validate_declare__/aeb171d2cc305f87c40b0407565ecdd1a4c396c46cd94f15ca0069e15eab01ed.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 26,
-                                                "end_line": 78,
+                                                "end_line": 77,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 78
+                                                "start_line": 77
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
-                                        "start_col": 100,
+                                        "start_col": 94,
                                         "start_line": 1
                                     },
-                                    "While expanding the reference 'range_check_ptr' in:"
+                                    "While expanding the reference 'ecdsa_ptr' in:"
                                 ],
                                 "start_col": 53,
-                                "start_line": 79
+                                "start_line": 78
                             },
                             "While constructing the external wrapper for:"
                         ],
-                        "start_col": 23,
+                        "start_col": 17,
                         "start_line": 1
                     }
                 },
-                "645": {
+                "613": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -19070,15 +18150,15 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 112,
+                        "end_col": 67,
                         "end_line": 1,
                         "input_file": {
-                            "filename": "autogen/starknet/external/__validate_declare__/972efe4adb0e1cedbdf0f0747cf1e121111a6180229de74773d49a6e595c4f3d.cairo"
+                            "filename": "autogen/starknet/external/__validate_declare__/741ea357d6336b0bed7bf0472425acd0311d543883b803388880e60a232040c7.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 98,
-                                "end_line": 79,
+                                "end_line": 78,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -19087,35 +18167,35 @@
                                         "end_col": 136,
                                         "end_line": 1,
                                         "input_file": {
-                                            "filename": "autogen/starknet/external/__validate_declare__/11e948d40597e98e975bf01626a4e8f9d0c95d23c5581719df49f99529b2abf9.cairo"
+                                            "filename": "autogen/starknet/external/__validate_declare__/aeb171d2cc305f87c40b0407565ecdd1a4c396c46cd94f15ca0069e15eab01ed.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 26,
-                                                "end_line": 78,
+                                                "end_line": 77,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 78
+                                                "start_line": 77
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
-                                        "start_col": 127,
+                                        "start_col": 121,
                                         "start_line": 1
                                     },
-                                    "While expanding the reference 'ecdsa_ptr' in:"
+                                    "While expanding the reference 'range_check_ptr' in:"
                                 ],
-                                "start_col": 70,
-                                "start_line": 79
+                                "start_col": 83,
+                                "start_line": 78
                             },
                             "While constructing the external wrapper for:"
                         ],
-                        "start_col": 17,
+                        "start_col": 23,
                         "start_line": 1
                     }
                 },
-                "646": {
+                "614": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -19133,7 +18213,7 @@
                         "parent_location": [
                             {
                                 "end_col": 19,
-                                "end_line": 80,
+                                "end_line": 79,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -19142,17 +18222,17 @@
                                         "end_col": 174,
                                         "end_line": 1,
                                         "input_file": {
-                                            "filename": "autogen/starknet/external/__validate_declare__/11e948d40597e98e975bf01626a4e8f9d0c95d23c5581719df49f99529b2abf9.cairo"
+                                            "filename": "autogen/starknet/external/__validate_declare__/aeb171d2cc305f87c40b0407565ecdd1a4c396c46cd94f15ca0069e15eab01ed.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 26,
-                                                "end_line": 78,
+                                                "end_line": 77,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 78
+                                                "start_line": 77
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -19162,7 +18242,7 @@
                                     "While expanding the reference '__calldata_arg_class_hash' in:"
                                 ],
                                 "start_col": 3,
-                                "start_line": 80
+                                "start_line": 79
                             },
                             "While handling calldata argument 'class_hash'"
                         ],
@@ -19170,7 +18250,7 @@
                         "start_line": 1
                     }
                 },
-                "647": {
+                "615": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -19181,15 +18261,15 @@
                     "hints": [],
                     "inst": {
                         "end_col": 26,
-                        "end_line": 78,
+                        "end_line": 77,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 6,
-                        "start_line": 78
+                        "start_line": 77
                     }
                 },
-                "649": {
+                "617": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -19203,17 +18283,17 @@
                                 "end_col": 34,
                                 "end_line": 2,
                                 "input_file": {
-                                    "filename": "autogen/starknet/external/__validate_declare__/11e948d40597e98e975bf01626a4e8f9d0c95d23c5581719df49f99529b2abf9.cairo"
+                                    "filename": "autogen/starknet/external/__validate_declare__/aeb171d2cc305f87c40b0407565ecdd1a4c396c46cd94f15ca0069e15eab01ed.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 26,
-                                        "end_line": 78,
+                                        "end_line": 77,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 6,
-                                        "start_line": 78
+                                        "start_line": 77
                                     },
                                     "While constructing the external wrapper for:"
                                 ],
@@ -19227,17 +18307,17 @@
                         "end_col": 24,
                         "end_line": 3,
                         "input_file": {
-                            "filename": "autogen/starknet/external/__validate_declare__/11e948d40597e98e975bf01626a4e8f9d0c95d23c5581719df49f99529b2abf9.cairo"
+                            "filename": "autogen/starknet/external/__validate_declare__/aeb171d2cc305f87c40b0407565ecdd1a4c396c46cd94f15ca0069e15eab01ed.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 26,
-                                "end_line": 78,
+                                "end_line": 77,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 78
+                                "start_line": 77
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -19245,7 +18325,7 @@
                         "start_line": 3
                     }
                 },
-                "651": {
+                "619": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -19258,12 +18338,12 @@
                         "end_col": 55,
                         "end_line": 1,
                         "input_file": {
-                            "filename": "autogen/starknet/external/__validate_declare__/11e948d40597e98e975bf01626a4e8f9d0c95d23c5581719df49f99529b2abf9.cairo"
+                            "filename": "autogen/starknet/external/__validate_declare__/aeb171d2cc305f87c40b0407565ecdd1a4c396c46cd94f15ca0069e15eab01ed.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 26,
-                                "end_line": 78,
+                                "end_line": 77,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -19277,12 +18357,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 26,
-                                                "end_line": 78,
+                                                "end_line": 77,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 78
+                                                "start_line": 77
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -19292,7 +18372,7 @@
                                     "While expanding the reference 'syscall_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 78
+                                "start_line": 77
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -19300,7 +18380,7 @@
                         "start_line": 1
                     }
                 },
-                "652": {
+                "620": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -19313,12 +18393,12 @@
                         "end_col": 82,
                         "end_line": 1,
                         "input_file": {
-                            "filename": "autogen/starknet/external/__validate_declare__/11e948d40597e98e975bf01626a4e8f9d0c95d23c5581719df49f99529b2abf9.cairo"
+                            "filename": "autogen/starknet/external/__validate_declare__/aeb171d2cc305f87c40b0407565ecdd1a4c396c46cd94f15ca0069e15eab01ed.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 26,
-                                "end_line": 78,
+                                "end_line": 77,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -19332,12 +18412,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 26,
-                                                "end_line": 78,
+                                                "end_line": 77,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 78
+                                                "start_line": 77
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -19347,7 +18427,7 @@
                                     "While expanding the reference 'pedersen_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 78
+                                "start_line": 77
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -19355,7 +18435,7 @@
                         "start_line": 1
                     }
                 },
-                "653": {
+                "621": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -19365,15 +18445,15 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 115,
+                        "end_col": 136,
                         "end_line": 1,
                         "input_file": {
-                            "filename": "autogen/starknet/external/__validate_declare__/11e948d40597e98e975bf01626a4e8f9d0c95d23c5581719df49f99529b2abf9.cairo"
+                            "filename": "autogen/starknet/external/__validate_declare__/aeb171d2cc305f87c40b0407565ecdd1a4c396c46cd94f15ca0069e15eab01ed.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 26,
-                                "end_line": 78,
+                                "end_line": 77,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -19387,12 +18467,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 26,
-                                                "end_line": 78,
+                                                "end_line": 77,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 78
+                                                "start_line": 77
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -19402,15 +18482,15 @@
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 78
+                                "start_line": 77
                             },
                             "While constructing the external wrapper for:"
                         ],
-                        "start_col": 100,
+                        "start_col": 121,
                         "start_line": 1
                     }
                 },
-                "654": {
+                "622": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -19420,15 +18500,15 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 136,
+                        "end_col": 103,
                         "end_line": 1,
                         "input_file": {
-                            "filename": "autogen/starknet/external/__validate_declare__/11e948d40597e98e975bf01626a4e8f9d0c95d23c5581719df49f99529b2abf9.cairo"
+                            "filename": "autogen/starknet/external/__validate_declare__/aeb171d2cc305f87c40b0407565ecdd1a4c396c46cd94f15ca0069e15eab01ed.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 26,
-                                "end_line": 78,
+                                "end_line": 77,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -19442,12 +18522,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 26,
-                                                "end_line": 78,
+                                                "end_line": 77,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 78
+                                                "start_line": 77
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -19457,15 +18537,15 @@
                                     "While expanding the reference 'ecdsa_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 78
+                                "start_line": 77
                             },
                             "While constructing the external wrapper for:"
                         ],
-                        "start_col": 127,
+                        "start_col": 94,
                         "start_line": 1
                     }
                 },
-                "655": {
+                "623": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -19483,7 +18563,7 @@
                         "parent_location": [
                             {
                                 "end_col": 26,
-                                "end_line": 78,
+                                "end_line": 77,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -19497,12 +18577,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 26,
-                                                "end_line": 78,
+                                                "end_line": 77,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 78
+                                                "start_line": 77
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -19512,7 +18592,7 @@
                                     "While expanding the reference 'bitwise_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 78
+                                "start_line": 77
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -19520,7 +18600,7 @@
                         "start_line": 1
                     }
                 },
-                "656": {
+                "624": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -19533,12 +18613,12 @@
                         "end_col": 21,
                         "end_line": 4,
                         "input_file": {
-                            "filename": "autogen/starknet/external/__validate_declare__/11e948d40597e98e975bf01626a4e8f9d0c95d23c5581719df49f99529b2abf9.cairo"
+                            "filename": "autogen/starknet/external/__validate_declare__/aeb171d2cc305f87c40b0407565ecdd1a4c396c46cd94f15ca0069e15eab01ed.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 26,
-                                "end_line": 78,
+                                "end_line": 77,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -19552,12 +18632,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 26,
-                                                "end_line": 78,
+                                                "end_line": 77,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 78
+                                                "start_line": 77
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -19567,7 +18647,7 @@
                                     "While expanding the reference 'retdata_size' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 78
+                                "start_line": 77
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -19575,7 +18655,7 @@
                         "start_line": 4
                     }
                 },
-                "658": {
+                "626": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -19588,12 +18668,12 @@
                         "end_col": 16,
                         "end_line": 3,
                         "input_file": {
-                            "filename": "autogen/starknet/external/__validate_declare__/11e948d40597e98e975bf01626a4e8f9d0c95d23c5581719df49f99529b2abf9.cairo"
+                            "filename": "autogen/starknet/external/__validate_declare__/aeb171d2cc305f87c40b0407565ecdd1a4c396c46cd94f15ca0069e15eab01ed.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 26,
-                                "end_line": 78,
+                                "end_line": 77,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -19607,12 +18687,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 26,
-                                                "end_line": 78,
+                                                "end_line": 77,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 78
+                                                "start_line": 77
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -19622,7 +18702,7 @@
                                     "While expanding the reference 'retdata' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 78
+                                "start_line": 77
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -19630,7 +18710,7 @@
                         "start_line": 3
                     }
                 },
-                "659": {
+                "627": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -19648,12 +18728,12 @@
                         "parent_location": [
                             {
                                 "end_col": 26,
-                                "end_line": 78,
+                                "end_line": 77,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 78
+                                "start_line": 77
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -19661,7 +18741,7 @@
                         "start_line": 1
                     }
                 },
-                "660": {
+                "628": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -19671,39 +18751,39 @@
                     "hints": [],
                     "inst": {
                         "end_col": 23,
-                        "end_line": 88,
+                        "end_line": 87,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 27,
-                                "end_line": 157,
+                                "end_line": 172,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 6,
-                                        "end_line": 98,
+                                        "end_line": 97,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 36,
-                                        "start_line": 96
+                                        "start_line": 95
                                     },
                                     "While trying to retrieve the implicit argument 'syscall_ptr' in:"
                                 ],
                                 "start_col": 9,
-                                "start_line": 157
+                                "start_line": 172
                             },
                             "While expanding the reference 'syscall_ptr' in:"
                         ],
                         "start_col": 5,
-                        "start_line": 88
+                        "start_line": 87
                     }
                 },
-                "661": {
+                "629": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -19713,39 +18793,39 @@
                     "hints": [],
                     "inst": {
                         "end_col": 31,
-                        "end_line": 89,
+                        "end_line": 88,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 35,
-                                "end_line": 158,
+                                "end_line": 173,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 6,
-                                        "end_line": 98,
+                                        "end_line": 97,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 36,
-                                        "start_line": 96
+                                        "start_line": 95
                                     },
                                     "While trying to retrieve the implicit argument 'pedersen_ptr' in:"
                                 ],
                                 "start_col": 9,
-                                "start_line": 158
+                                "start_line": 173
                             },
                             "While expanding the reference 'pedersen_ptr' in:"
                         ],
                         "start_col": 5,
-                        "start_line": 89
+                        "start_line": 88
                     }
                 },
-                "662": {
+                "630": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -19754,40 +18834,40 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 20,
-                        "end_line": 90,
+                        "end_col": 33,
+                        "end_line": 89,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 24,
-                                "end_line": 159,
+                                "end_col": 37,
+                                "end_line": 174,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 6,
-                                        "end_line": 98,
+                                        "end_line": 97,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 36,
-                                        "start_line": 96
+                                        "start_line": 95
                                     },
-                                    "While trying to retrieve the implicit argument 'range_check_ptr' in:"
+                                    "While trying to retrieve the implicit argument 'ecdsa_ptr' in:"
                                 ],
                                 "start_col": 9,
-                                "start_line": 159
+                                "start_line": 174
                             },
-                            "While expanding the reference 'range_check_ptr' in:"
+                            "While expanding the reference 'ecdsa_ptr' in:"
                         ],
                         "start_col": 5,
-                        "start_line": 90
+                        "start_line": 89
                     }
                 },
-                "663": {
+                "631": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -19797,39 +18877,39 @@
                     "hints": [],
                     "inst": {
                         "end_col": 33,
-                        "end_line": 91,
+                        "end_line": 90,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 37,
-                                "end_line": 160,
+                                "end_line": 175,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 6,
-                                        "end_line": 98,
+                                        "end_line": 97,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 36,
-                                        "start_line": 96
+                                        "start_line": 95
                                     },
-                                    "While trying to retrieve the implicit argument 'ecdsa_ptr' in:"
+                                    "While trying to retrieve the implicit argument 'bitwise_ptr' in:"
                                 ],
                                 "start_col": 9,
-                                "start_line": 160
+                                "start_line": 175
                             },
-                            "While expanding the reference 'ecdsa_ptr' in:"
+                            "While expanding the reference 'bitwise_ptr' in:"
                         ],
                         "start_col": 5,
-                        "start_line": 91
+                        "start_line": 90
                     }
                 },
-                "664": {
+                "632": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -19838,40 +18918,40 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 33,
-                        "end_line": 92,
+                        "end_col": 20,
+                        "end_line": 91,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 37,
-                                "end_line": 161,
+                                "end_col": 24,
+                                "end_line": 176,
                                 "input_file": {
-                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 6,
-                                        "end_line": 98,
+                                        "end_line": 97,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 36,
-                                        "start_line": 96
+                                        "start_line": 95
                                     },
-                                    "While trying to retrieve the implicit argument 'bitwise_ptr' in:"
+                                    "While trying to retrieve the implicit argument 'range_check_ptr' in:"
                                 ],
                                 "start_col": 9,
-                                "start_line": 161
+                                "start_line": 176
                             },
-                            "While expanding the reference 'bitwise_ptr' in:"
+                            "While expanding the reference 'range_check_ptr' in:"
                         ],
                         "start_col": 5,
-                        "start_line": 92
+                        "start_line": 91
                     }
                 },
-                "665": {
+                "633": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -19881,27 +18961,27 @@
                     "hints": [],
                     "inst": {
                         "end_col": 23,
-                        "end_line": 93,
+                        "end_line": 92,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 97,
+                                "end_line": 96,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 9,
-                                "start_line": 97
+                                "start_line": 96
                             },
                             "While expanding the reference 'call_array_len' in:"
                         ],
                         "start_col": 3,
-                        "start_line": 93
+                        "start_line": 92
                     }
                 },
-                "666": {
+                "634": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -19911,27 +18991,27 @@
                     "hints": [],
                     "inst": {
                         "end_col": 54,
-                        "end_line": 93,
+                        "end_line": 92,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 35,
-                                "end_line": 97,
+                                "end_line": 96,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 25,
-                                "start_line": 97
+                                "start_line": 96
                             },
                             "While expanding the reference 'call_array' in:"
                         ],
                         "start_col": 25,
-                        "start_line": 93
+                        "start_line": 92
                     }
                 },
-                "667": {
+                "635": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -19941,27 +19021,27 @@
                     "hints": [],
                     "inst": {
                         "end_col": 74,
-                        "end_line": 93,
+                        "end_line": 92,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 49,
-                                "end_line": 97,
+                                "end_line": 96,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 37,
-                                "start_line": 97
+                                "start_line": 96
                             },
                             "While expanding the reference 'calldata_len' in:"
                         ],
                         "start_col": 56,
-                        "start_line": 93
+                        "start_line": 92
                     }
                 },
-                "668": {
+                "636": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -19971,27 +19051,27 @@
                     "hints": [],
                     "inst": {
                         "end_col": 91,
-                        "end_line": 93,
+                        "end_line": 92,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 59,
-                                "end_line": 97,
+                                "end_line": 96,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 51,
-                                "start_line": 97
+                                "start_line": 96
                             },
                             "While expanding the reference 'calldata' in:"
                         ],
                         "start_col": 76,
-                        "start_line": 93
+                        "start_line": 92
                     }
                 },
-                "669": {
+                "637": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -20001,15 +19081,15 @@
                     "hints": [],
                     "inst": {
                         "end_col": 6,
-                        "end_line": 98,
+                        "end_line": 97,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 36,
-                        "start_line": 96
+                        "start_line": 95
                     }
                 },
-                "671": {
+                "639": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -20018,16 +19098,16 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 59,
-                        "end_line": 99,
+                        "end_col": 37,
+                        "end_line": 98,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 5,
-                        "start_line": 99
+                        "start_line": 98
                     }
                 },
-                "672": {
+                "640": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -20046,12 +19126,12 @@
                                 "parent_location": [
                                     {
                                         "end_col": 17,
-                                        "end_line": 87,
+                                        "end_line": 86,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 6,
-                                        "start_line": 87
+                                        "start_line": 86
                                     },
                                     "While handling return value of"
                                 ],
@@ -20070,12 +19150,12 @@
                         "parent_location": [
                             {
                                 "end_col": 17,
-                                "end_line": 87,
+                                "end_line": 86,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 87
+                                "start_line": 86
                             },
                             "While handling return value of"
                         ],
@@ -20083,7 +19163,7 @@
                         "start_line": 4
                     }
                 },
-                "674": {
+                "642": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -20101,12 +19181,12 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 94,
+                                "end_line": 93,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 5,
-                                "start_line": 94
+                                "start_line": 93
                             },
                             "While handling return value 'response_len'"
                         ],
@@ -20114,7 +19194,7 @@
                         "start_line": 1
                     }
                 },
-                "675": {
+                "643": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -20132,12 +19212,12 @@
                         "parent_location": [
                             {
                                 "end_col": 40,
-                                "end_line": 94,
+                                "end_line": 93,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 25,
-                                "start_line": 94
+                                "start_line": 93
                             },
                             "While handling return value 'response'"
                         ],
@@ -20145,7 +19225,7 @@
                         "start_line": 2
                     }
                 },
-                "676": {
+                "644": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -20163,12 +19243,12 @@
                         "parent_location": [
                             {
                                 "end_col": 40,
-                                "end_line": 94,
+                                "end_line": 93,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 25,
-                                "start_line": 94
+                                "start_line": 93
                             },
                             "While handling return value 'response'"
                         ],
@@ -20176,7 +19256,7 @@
                         "start_line": 5
                     }
                 },
-                "678": {
+                "646": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -20194,7 +19274,7 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 94,
+                                "end_line": 93,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -20208,12 +19288,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 40,
-                                                "end_line": 94,
+                                                "end_line": 93,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 25,
-                                                "start_line": 94
+                                                "start_line": 93
                                             },
                                             "While handling return value 'response'"
                                         ],
@@ -20223,7 +19303,7 @@
                                     "While expanding the reference '__return_value_ptr' in:"
                                 ],
                                 "start_col": 5,
-                                "start_line": 94
+                                "start_line": 93
                             },
                             "While handling return value 'response_len'"
                         ],
@@ -20231,7 +19311,7 @@
                         "start_line": 2
                     }
                 },
-                "680": {
+                "648": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -20249,12 +19329,12 @@
                         "parent_location": [
                             {
                                 "end_col": 40,
-                                "end_line": 94,
+                                "end_line": 93,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 25,
-                                "start_line": 94
+                                "start_line": 93
                             },
                             "While handling return value 'response'"
                         ],
@@ -20262,7 +19342,7 @@
                         "start_line": 10
                     }
                 },
-                "681": {
+                "649": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -20280,7 +19360,7 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 94,
+                                "end_line": 93,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -20294,7 +19374,7 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 40,
-                                                "end_line": 94,
+                                                "end_line": 93,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
@@ -20308,12 +19388,12 @@
                                                         "parent_location": [
                                                             {
                                                                 "end_col": 40,
-                                                                "end_line": 94,
+                                                                "end_line": 93,
                                                                 "input_file": {
                                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                                 },
                                                                 "start_col": 25,
-                                                                "start_line": 94
+                                                                "start_line": 93
                                                             },
                                                             "While handling return value 'response'"
                                                         ],
@@ -20323,7 +19403,7 @@
                                                     "While expanding the reference '__return_value_ptr_copy' in:"
                                                 ],
                                                 "start_col": 25,
-                                                "start_line": 94
+                                                "start_line": 93
                                             },
                                             "While handling return value 'response'"
                                         ],
@@ -20333,7 +19413,7 @@
                                     "While expanding the reference '__return_value_ptr' in:"
                                 ],
                                 "start_col": 5,
-                                "start_line": 94
+                                "start_line": 93
                             },
                             "While handling return value 'response_len'"
                         ],
@@ -20341,7 +19421,7 @@
                         "start_line": 2
                     }
                 },
-                "683": {
+                "651": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -20359,12 +19439,12 @@
                         "parent_location": [
                             {
                                 "end_col": 40,
-                                "end_line": 94,
+                                "end_line": 93,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 25,
-                                "start_line": 94
+                                "start_line": 93
                             },
                             "While handling return value 'response'"
                         ],
@@ -20372,7 +19452,7 @@
                         "start_line": 13
                     }
                 },
-                "684": {
+                "652": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -20390,12 +19470,12 @@
                         "parent_location": [
                             {
                                 "end_col": 40,
-                                "end_line": 94,
+                                "end_line": 93,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 25,
-                                "start_line": 94
+                                "start_line": 93
                             },
                             "While handling return value 'response'"
                         ],
@@ -20403,7 +19483,7 @@
                         "start_line": 14
                     }
                 },
-                "685": {
+                "653": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -20421,12 +19501,12 @@
                         "parent_location": [
                             {
                                 "end_col": 40,
-                                "end_line": 94,
+                                "end_line": 93,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 25,
-                                "start_line": 94
+                                "start_line": 93
                             },
                             "While handling return value 'response'"
                         ],
@@ -20434,7 +19514,7 @@
                         "start_line": 11
                     }
                 },
-                "687": {
+                "655": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -20452,7 +19532,7 @@
                         "parent_location": [
                             {
                                 "end_col": 40,
-                                "end_line": 94,
+                                "end_line": 93,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -20466,12 +19546,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 87,
+                                                "end_line": 86,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 87
+                                                "start_line": 86
                                             },
                                             "While handling return value of"
                                         ],
@@ -20481,7 +19561,7 @@
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
                                 "start_col": 25,
-                                "start_line": 94
+                                "start_line": 93
                             },
                             "While handling return value 'response'"
                         ],
@@ -20489,7 +19569,7 @@
                         "start_line": 5
                     }
                 },
-                "688": {
+                "656": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -20507,12 +19587,12 @@
                         "parent_location": [
                             {
                                 "end_col": 17,
-                                "end_line": 87,
+                                "end_line": 86,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 87
+                                "start_line": 86
                             },
                             "While handling return value of"
                         ],
@@ -20520,7 +19600,7 @@
                         "start_line": 11
                     }
                 },
-                "689": {
+                "657": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -20538,7 +19618,7 @@
                         "parent_location": [
                             {
                                 "end_col": 17,
-                                "end_line": 87,
+                                "end_line": 86,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -20552,12 +19632,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 87,
+                                                "end_line": 86,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 87
+                                                "start_line": 86
                                             },
                                             "While handling return value of"
                                         ],
@@ -20567,7 +19647,7 @@
                                     "While expanding the reference '__return_value_ptr_start' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 87
+                                "start_line": 86
                             },
                             "While handling return value of"
                         ],
@@ -20575,7 +19655,7 @@
                         "start_line": 5
                     }
                 },
-                "690": {
+                "658": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -20593,12 +19673,12 @@
                         "parent_location": [
                             {
                                 "end_col": 17,
-                                "end_line": 87,
+                                "end_line": 86,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 87
+                                "start_line": 86
                             },
                             "While handling return value of"
                         ],
@@ -20606,7 +19686,7 @@
                         "start_line": 9
                     }
                 },
-                "691": {
+                "659": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -20624,12 +19704,12 @@
                         "parent_location": [
                             {
                                 "end_col": 17,
-                                "end_line": 87,
+                                "end_line": 86,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 87
+                                "start_line": 86
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -20637,7 +19717,7 @@
                         "start_line": 2
                     }
                 },
-                "693": {
+                "661": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -20655,7 +19735,7 @@
                         "parent_location": [
                             {
                                 "end_col": 20,
-                                "end_line": 90,
+                                "end_line": 91,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -20669,12 +19749,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 54,
-                                                "end_line": 93,
+                                                "end_line": 92,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 25,
-                                                "start_line": 93
+                                                "start_line": 92
                                             },
                                             "While handling calldata argument 'call_array'"
                                         ],
@@ -20684,7 +19764,7 @@
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
                                 "start_col": 5,
-                                "start_line": 90
+                                "start_line": 91
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -20692,7 +19772,7 @@
                         "start_line": 1
                     }
                 },
-                "694": {
+                "662": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -20710,7 +19790,7 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 93,
+                                "end_line": 92,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -20724,12 +19804,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 54,
-                                                "end_line": 93,
+                                                "end_line": 92,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 25,
-                                                "start_line": 93
+                                                "start_line": 92
                                             },
                                             "While handling calldata argument 'call_array'"
                                         ],
@@ -20739,7 +19819,7 @@
                                     "While expanding the reference '__calldata_arg_call_array_len' in:"
                                 ],
                                 "start_col": 3,
-                                "start_line": 93
+                                "start_line": 92
                             },
                             "While handling calldata argument 'call_array_len'"
                         ],
@@ -20747,7 +19827,7 @@
                         "start_line": 1
                     }
                 },
-                "695": {
+                "663": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -20765,12 +19845,12 @@
                         "parent_location": [
                             {
                                 "end_col": 54,
-                                "end_line": 93,
+                                "end_line": 92,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 25,
-                                "start_line": 93
+                                "start_line": 92
                             },
                             "While handling calldata argument 'call_array'"
                         ],
@@ -20778,7 +19858,7 @@
                         "start_line": 2
                     }
                 },
-                "696": {
+                "664": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -20796,7 +19876,7 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 93,
+                                "end_line": 92,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -20810,12 +19890,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 54,
-                                                "end_line": 93,
+                                                "end_line": 92,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 25,
-                                                "start_line": 93
+                                                "start_line": 92
                                             },
                                             "While handling calldata argument 'call_array'"
                                         ],
@@ -20825,7 +19905,7 @@
                                     "While expanding the reference '__calldata_ptr' in:"
                                 ],
                                 "start_col": 3,
-                                "start_line": 93
+                                "start_line": 92
                             },
                             "While handling calldata argument 'call_array_len'"
                         ],
@@ -20833,7 +19913,7 @@
                         "start_line": 2
                     }
                 },
-                "698": {
+                "666": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -20851,7 +19931,7 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 93,
+                                "end_line": 92,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -20865,12 +19945,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 54,
-                                                "end_line": 93,
+                                                "end_line": 92,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 25,
-                                                "start_line": 93
+                                                "start_line": 92
                                             },
                                             "While handling calldata argument 'call_array'"
                                         ],
@@ -20880,7 +19960,7 @@
                                     "While expanding the reference '__calldata_arg_call_array_len' in:"
                                 ],
                                 "start_col": 3,
-                                "start_line": 93
+                                "start_line": 92
                             },
                             "While handling calldata argument 'call_array_len'"
                         ],
@@ -20888,7 +19968,7 @@
                         "start_line": 1
                     }
                 },
-                "699": {
+                "667": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -20906,12 +19986,12 @@
                         "parent_location": [
                             {
                                 "end_col": 54,
-                                "end_line": 93,
+                                "end_line": 92,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 25,
-                                "start_line": 93
+                                "start_line": 92
                             },
                             "While handling calldata argument 'call_array'"
                         ],
@@ -20919,7 +19999,7 @@
                         "start_line": 8
                     }
                 },
-                "701": {
+                "669": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -20937,12 +20017,12 @@
                         "parent_location": [
                             {
                                 "end_col": 54,
-                                "end_line": 93,
+                                "end_line": 92,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 25,
-                                "start_line": 93
+                                "start_line": 92
                             },
                             "While handling calldata argument 'call_array'"
                         ],
@@ -20950,7 +20030,7 @@
                         "start_line": 8
                     }
                 },
-                "702": {
+                "670": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -20968,7 +20048,7 @@
                         "parent_location": [
                             {
                                 "end_col": 20,
-                                "end_line": 90,
+                                "end_line": 91,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -20982,7 +20062,7 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 54,
-                                                "end_line": 93,
+                                                "end_line": 92,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
@@ -20996,12 +20076,12 @@
                                                         "parent_location": [
                                                             {
                                                                 "end_col": 91,
-                                                                "end_line": 93,
+                                                                "end_line": 92,
                                                                 "input_file": {
                                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                                 },
                                                                 "start_col": 76,
-                                                                "start_line": 93
+                                                                "start_line": 92
                                                             },
                                                             "While handling calldata argument 'calldata'"
                                                         ],
@@ -21011,7 +20091,7 @@
                                                     "While expanding the reference 'range_check_ptr' in:"
                                                 ],
                                                 "start_col": 25,
-                                                "start_line": 93
+                                                "start_line": 92
                                             },
                                             "While handling calldata argument 'call_array'"
                                         ],
@@ -21021,7 +20101,7 @@
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
                                 "start_col": 5,
-                                "start_line": 90
+                                "start_line": 91
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -21029,7 +20109,7 @@
                         "start_line": 1
                     }
                 },
-                "703": {
+                "671": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -21047,7 +20127,7 @@
                         "parent_location": [
                             {
                                 "end_col": 74,
-                                "end_line": 93,
+                                "end_line": 92,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -21061,12 +20141,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 91,
-                                                "end_line": 93,
+                                                "end_line": 92,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 76,
-                                                "start_line": 93
+                                                "start_line": 92
                                             },
                                             "While handling calldata argument 'calldata'"
                                         ],
@@ -21076,7 +20156,7 @@
                                     "While expanding the reference '__calldata_arg_calldata_len' in:"
                                 ],
                                 "start_col": 56,
-                                "start_line": 93
+                                "start_line": 92
                             },
                             "While handling calldata argument 'calldata_len'"
                         ],
@@ -21084,7 +20164,7 @@
                         "start_line": 1
                     }
                 },
-                "704": {
+                "672": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -21102,12 +20182,12 @@
                         "parent_location": [
                             {
                                 "end_col": 91,
-                                "end_line": 93,
+                                "end_line": 92,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 76,
-                                "start_line": 93
+                                "start_line": 92
                             },
                             "While handling calldata argument 'calldata'"
                         ],
@@ -21115,7 +20195,7 @@
                         "start_line": 2
                     }
                 },
-                "705": {
+                "673": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -21133,7 +20213,7 @@
                         "parent_location": [
                             {
                                 "end_col": 74,
-                                "end_line": 93,
+                                "end_line": 92,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -21147,12 +20227,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 91,
-                                                "end_line": 93,
+                                                "end_line": 92,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 76,
-                                                "start_line": 93
+                                                "start_line": 92
                                             },
                                             "While handling calldata argument 'calldata'"
                                         ],
@@ -21162,7 +20242,7 @@
                                     "While expanding the reference '__calldata_ptr' in:"
                                 ],
                                 "start_col": 56,
-                                "start_line": 93
+                                "start_line": 92
                             },
                             "While handling calldata argument 'calldata_len'"
                         ],
@@ -21170,7 +20250,7 @@
                         "start_line": 2
                     }
                 },
-                "707": {
+                "675": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -21188,7 +20268,7 @@
                         "parent_location": [
                             {
                                 "end_col": 74,
-                                "end_line": 93,
+                                "end_line": 92,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -21202,12 +20282,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 91,
-                                                "end_line": 93,
+                                                "end_line": 92,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 76,
-                                                "start_line": 93
+                                                "start_line": 92
                                             },
                                             "While handling calldata argument 'calldata'"
                                         ],
@@ -21217,7 +20297,7 @@
                                     "While expanding the reference '__calldata_arg_calldata_len' in:"
                                 ],
                                 "start_col": 56,
-                                "start_line": 93
+                                "start_line": 92
                             },
                             "While handling calldata argument 'calldata_len'"
                         ],
@@ -21225,7 +20305,7 @@
                         "start_line": 1
                     }
                 },
-                "708": {
+                "676": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -21243,12 +20323,12 @@
                         "parent_location": [
                             {
                                 "end_col": 91,
-                                "end_line": 93,
+                                "end_line": 92,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 76,
-                                "start_line": 93
+                                "start_line": 92
                             },
                             "While handling calldata argument 'calldata'"
                         ],
@@ -21256,7 +20336,7 @@
                         "start_line": 8
                     }
                 },
-                "709": {
+                "677": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -21274,12 +20354,12 @@
                         "parent_location": [
                             {
                                 "end_col": 17,
-                                "end_line": 87,
+                                "end_line": 86,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 87
+                                "start_line": 86
                             },
                             "While handling calldata of"
                         ],
@@ -21287,7 +20367,7 @@
                         "start_line": 1
                     }
                 },
-                "710": {
+                "678": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -21305,7 +20385,7 @@
                         "parent_location": [
                             {
                                 "end_col": 20,
-                                "end_line": 90,
+                                "end_line": 91,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -21319,7 +20399,7 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 54,
-                                                "end_line": 93,
+                                                "end_line": 92,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
@@ -21333,36 +20413,36 @@
                                                         "parent_location": [
                                                             {
                                                                 "end_col": 91,
-                                                                "end_line": 93,
+                                                                "end_line": 92,
                                                                 "input_file": {
                                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                                 },
                                                                 "parent_location": [
                                                                     {
-                                                                        "end_col": 115,
+                                                                        "end_col": 161,
                                                                         "end_line": 1,
                                                                         "input_file": {
-                                                                            "filename": "autogen/starknet/external/__execute__/5eddd16975c94f7a4fbf6eea486e12d2a7b944f1b3837ebd72a45a0896a519c8.cairo"
+                                                                            "filename": "autogen/starknet/external/__execute__/fda2b8aa49b29c30228f00b8e9823863453031a1abe9ca64b44c8468cfa74e87.cairo"
                                                                         },
                                                                         "parent_location": [
                                                                             {
                                                                                 "end_col": 17,
-                                                                                "end_line": 87,
+                                                                                "end_line": 86,
                                                                                 "input_file": {
                                                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                                                 },
                                                                                 "start_col": 6,
-                                                                                "start_line": 87
+                                                                                "start_line": 86
                                                                             },
                                                                             "While constructing the external wrapper for:"
                                                                         ],
-                                                                        "start_col": 100,
+                                                                        "start_col": 146,
                                                                         "start_line": 1
                                                                     },
                                                                     "While expanding the reference 'range_check_ptr' in:"
                                                                 ],
                                                                 "start_col": 76,
-                                                                "start_line": 93
+                                                                "start_line": 92
                                                             },
                                                             "While handling calldata argument 'calldata'"
                                                         ],
@@ -21372,7 +20452,7 @@
                                                     "While expanding the reference 'range_check_ptr' in:"
                                                 ],
                                                 "start_col": 25,
-                                                "start_line": 93
+                                                "start_line": 92
                                             },
                                             "While handling calldata argument 'call_array'"
                                         ],
@@ -21382,7 +20462,7 @@
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
                                 "start_col": 5,
-                                "start_line": 90
+                                "start_line": 91
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -21390,7 +20470,7 @@
                         "start_line": 1
                     }
                 },
-                "711": {
+                "679": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -21408,7 +20488,7 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 88,
+                                "end_line": 87,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -21417,17 +20497,17 @@
                                         "end_col": 55,
                                         "end_line": 1,
                                         "input_file": {
-                                            "filename": "autogen/starknet/external/__execute__/5eddd16975c94f7a4fbf6eea486e12d2a7b944f1b3837ebd72a45a0896a519c8.cairo"
+                                            "filename": "autogen/starknet/external/__execute__/fda2b8aa49b29c30228f00b8e9823863453031a1abe9ca64b44c8468cfa74e87.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 87,
+                                                "end_line": 86,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 87
+                                                "start_line": 86
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -21437,7 +20517,7 @@
                                     "While expanding the reference 'syscall_ptr' in:"
                                 ],
                                 "start_col": 5,
-                                "start_line": 88
+                                "start_line": 87
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -21445,7 +20525,7 @@
                         "start_line": 1
                     }
                 },
-                "712": {
+                "680": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -21463,7 +20543,7 @@
                         "parent_location": [
                             {
                                 "end_col": 31,
-                                "end_line": 89,
+                                "end_line": 88,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -21472,17 +20552,17 @@
                                         "end_col": 82,
                                         "end_line": 1,
                                         "input_file": {
-                                            "filename": "autogen/starknet/external/__execute__/5eddd16975c94f7a4fbf6eea486e12d2a7b944f1b3837ebd72a45a0896a519c8.cairo"
+                                            "filename": "autogen/starknet/external/__execute__/fda2b8aa49b29c30228f00b8e9823863453031a1abe9ca64b44c8468cfa74e87.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 87,
+                                                "end_line": 86,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 87
+                                                "start_line": 86
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -21492,7 +20572,7 @@
                                     "While expanding the reference 'pedersen_ptr' in:"
                                 ],
                                 "start_col": 5,
-                                "start_line": 89
+                                "start_line": 88
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -21500,7 +20580,7 @@
                         "start_line": 1
                     }
                 },
-                "713": {
+                "681": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -21510,52 +20590,52 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 42,
-                        "end_line": 3,
+                        "end_col": 112,
+                        "end_line": 1,
                         "input_file": {
-                            "filename": "autogen/starknet/arg_processor/60a1d0127411d0a1f9a364f5245ae52da8e752ea42edf6ddaf5217c8bdeb8bad.cairo"
+                            "filename": "autogen/starknet/external/__execute__/972efe4adb0e1cedbdf0f0747cf1e121111a6180229de74773d49a6e595c4f3d.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 91,
-                                "end_line": 93,
+                                "end_col": 33,
+                                "end_line": 89,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 115,
+                                        "end_col": 103,
                                         "end_line": 1,
                                         "input_file": {
-                                            "filename": "autogen/starknet/external/__execute__/5eddd16975c94f7a4fbf6eea486e12d2a7b944f1b3837ebd72a45a0896a519c8.cairo"
+                                            "filename": "autogen/starknet/external/__execute__/fda2b8aa49b29c30228f00b8e9823863453031a1abe9ca64b44c8468cfa74e87.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 87,
+                                                "end_line": 86,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 87
+                                                "start_line": 86
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
-                                        "start_col": 100,
+                                        "start_col": 94,
                                         "start_line": 1
                                     },
-                                    "While expanding the reference 'range_check_ptr' in:"
+                                    "While expanding the reference 'ecdsa_ptr' in:"
                                 ],
-                                "start_col": 76,
-                                "start_line": 93
+                                "start_col": 5,
+                                "start_line": 89
                             },
-                            "While handling calldata argument 'calldata'"
+                            "While constructing the external wrapper for:"
                         ],
-                        "start_col": 23,
-                        "start_line": 3
+                        "start_col": 17,
+                        "start_line": 1
                     }
                 },
-                "715": {
+                "682": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -21568,49 +20648,49 @@
                         "end_col": 112,
                         "end_line": 1,
                         "input_file": {
-                            "filename": "autogen/starknet/external/__execute__/972efe4adb0e1cedbdf0f0747cf1e121111a6180229de74773d49a6e595c4f3d.cairo"
+                            "filename": "autogen/starknet/external/__execute__/14203d9b4e0dcdb2fae0cfadacffb50de6a91057e77d7d8f2555840ed4167b4d.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 33,
-                                "end_line": 91,
+                                "end_line": 90,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 136,
+                                        "end_col": 128,
                                         "end_line": 1,
                                         "input_file": {
-                                            "filename": "autogen/starknet/external/__execute__/5eddd16975c94f7a4fbf6eea486e12d2a7b944f1b3837ebd72a45a0896a519c8.cairo"
+                                            "filename": "autogen/starknet/external/__execute__/fda2b8aa49b29c30228f00b8e9823863453031a1abe9ca64b44c8468cfa74e87.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 87,
+                                                "end_line": 86,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 87
+                                                "start_line": 86
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
-                                        "start_col": 127,
+                                        "start_col": 117,
                                         "start_line": 1
                                     },
-                                    "While expanding the reference 'ecdsa_ptr' in:"
+                                    "While expanding the reference 'bitwise_ptr' in:"
                                 ],
                                 "start_col": 5,
-                                "start_line": 91
+                                "start_line": 90
                             },
                             "While constructing the external wrapper for:"
                         ],
-                        "start_col": 17,
+                        "start_col": 19,
                         "start_line": 1
                     }
                 },
-                "716": {
+                "683": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -21620,14 +20700,14 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 112,
-                        "end_line": 1,
+                        "end_col": 42,
+                        "end_line": 3,
                         "input_file": {
-                            "filename": "autogen/starknet/external/__execute__/14203d9b4e0dcdb2fae0cfadacffb50de6a91057e77d7d8f2555840ed4167b4d.cairo"
+                            "filename": "autogen/starknet/arg_processor/60a1d0127411d0a1f9a364f5245ae52da8e752ea42edf6ddaf5217c8bdeb8bad.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 33,
+                                "end_col": 91,
                                 "end_line": 92,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
@@ -21637,35 +20717,35 @@
                                         "end_col": 161,
                                         "end_line": 1,
                                         "input_file": {
-                                            "filename": "autogen/starknet/external/__execute__/5eddd16975c94f7a4fbf6eea486e12d2a7b944f1b3837ebd72a45a0896a519c8.cairo"
+                                            "filename": "autogen/starknet/external/__execute__/fda2b8aa49b29c30228f00b8e9823863453031a1abe9ca64b44c8468cfa74e87.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 87,
+                                                "end_line": 86,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 87
+                                                "start_line": 86
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
-                                        "start_col": 150,
+                                        "start_col": 146,
                                         "start_line": 1
                                     },
-                                    "While expanding the reference 'bitwise_ptr' in:"
+                                    "While expanding the reference 'range_check_ptr' in:"
                                 ],
-                                "start_col": 5,
+                                "start_col": 76,
                                 "start_line": 92
                             },
-                            "While constructing the external wrapper for:"
+                            "While handling calldata argument 'calldata'"
                         ],
-                        "start_col": 19,
-                        "start_line": 1
+                        "start_col": 23,
+                        "start_line": 3
                     }
                 },
-                "717": {
+                "685": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -21683,7 +20763,7 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 93,
+                                "end_line": 92,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -21692,17 +20772,17 @@
                                         "end_col": 207,
                                         "end_line": 1,
                                         "input_file": {
-                                            "filename": "autogen/starknet/external/__execute__/5eddd16975c94f7a4fbf6eea486e12d2a7b944f1b3837ebd72a45a0896a519c8.cairo"
+                                            "filename": "autogen/starknet/external/__execute__/fda2b8aa49b29c30228f00b8e9823863453031a1abe9ca64b44c8468cfa74e87.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 87,
+                                                "end_line": 86,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 87
+                                                "start_line": 86
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -21712,7 +20792,7 @@
                                     "While expanding the reference '__calldata_arg_call_array_len' in:"
                                 ],
                                 "start_col": 3,
-                                "start_line": 93
+                                "start_line": 92
                             },
                             "While handling calldata argument 'call_array_len'"
                         ],
@@ -21720,7 +20800,7 @@
                         "start_line": 1
                     }
                 },
-                "718": {
+                "686": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -21738,7 +20818,7 @@
                         "parent_location": [
                             {
                                 "end_col": 54,
-                                "end_line": 93,
+                                "end_line": 92,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -21747,17 +20827,17 @@
                                         "end_col": 245,
                                         "end_line": 1,
                                         "input_file": {
-                                            "filename": "autogen/starknet/external/__execute__/5eddd16975c94f7a4fbf6eea486e12d2a7b944f1b3837ebd72a45a0896a519c8.cairo"
+                                            "filename": "autogen/starknet/external/__execute__/fda2b8aa49b29c30228f00b8e9823863453031a1abe9ca64b44c8468cfa74e87.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 87,
+                                                "end_line": 86,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 87
+                                                "start_line": 86
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -21767,7 +20847,7 @@
                                     "While expanding the reference '__calldata_arg_call_array' in:"
                                 ],
                                 "start_col": 25,
-                                "start_line": 93
+                                "start_line": 92
                             },
                             "While handling calldata argument 'call_array'"
                         ],
@@ -21775,7 +20855,7 @@
                         "start_line": 5
                     }
                 },
-                "720": {
+                "688": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -21793,7 +20873,7 @@
                         "parent_location": [
                             {
                                 "end_col": 74,
-                                "end_line": 93,
+                                "end_line": 92,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -21802,17 +20882,17 @@
                                         "end_col": 287,
                                         "end_line": 1,
                                         "input_file": {
-                                            "filename": "autogen/starknet/external/__execute__/5eddd16975c94f7a4fbf6eea486e12d2a7b944f1b3837ebd72a45a0896a519c8.cairo"
+                                            "filename": "autogen/starknet/external/__execute__/fda2b8aa49b29c30228f00b8e9823863453031a1abe9ca64b44c8468cfa74e87.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 87,
+                                                "end_line": 86,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 87
+                                                "start_line": 86
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -21822,7 +20902,7 @@
                                     "While expanding the reference '__calldata_arg_calldata_len' in:"
                                 ],
                                 "start_col": 56,
-                                "start_line": 93
+                                "start_line": 92
                             },
                             "While handling calldata argument 'calldata_len'"
                         ],
@@ -21830,7 +20910,7 @@
                         "start_line": 1
                     }
                 },
-                "721": {
+                "689": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -21848,7 +20928,7 @@
                         "parent_location": [
                             {
                                 "end_col": 91,
-                                "end_line": 93,
+                                "end_line": 92,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -21857,17 +20937,17 @@
                                         "end_col": 321,
                                         "end_line": 1,
                                         "input_file": {
-                                            "filename": "autogen/starknet/external/__execute__/5eddd16975c94f7a4fbf6eea486e12d2a7b944f1b3837ebd72a45a0896a519c8.cairo"
+                                            "filename": "autogen/starknet/external/__execute__/fda2b8aa49b29c30228f00b8e9823863453031a1abe9ca64b44c8468cfa74e87.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 87,
+                                                "end_line": 86,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 87
+                                                "start_line": 86
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -21877,7 +20957,7 @@
                                     "While expanding the reference '__calldata_arg_calldata' in:"
                                 ],
                                 "start_col": 76,
-                                "start_line": 93
+                                "start_line": 92
                             },
                             "While handling calldata argument 'calldata'"
                         ],
@@ -21885,7 +20965,7 @@
                         "start_line": 5
                     }
                 },
-                "723": {
+                "691": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -21896,15 +20976,15 @@
                     "hints": [],
                     "inst": {
                         "end_col": 17,
-                        "end_line": 87,
+                        "end_line": 86,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 6,
-                        "start_line": 87
+                        "start_line": 86
                     }
                 },
-                "725": {
+                "693": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -21917,12 +20997,12 @@
                         "end_col": 55,
                         "end_line": 1,
                         "input_file": {
-                            "filename": "autogen/starknet/external/__execute__/5eddd16975c94f7a4fbf6eea486e12d2a7b944f1b3837ebd72a45a0896a519c8.cairo"
+                            "filename": "autogen/starknet/external/__execute__/fda2b8aa49b29c30228f00b8e9823863453031a1abe9ca64b44c8468cfa74e87.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 17,
-                                "end_line": 87,
+                                "end_line": 86,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -21931,17 +21011,17 @@
                                         "end_col": 55,
                                         "end_line": 1,
                                         "input_file": {
-                                            "filename": "autogen/starknet/external/__execute__/5eddd16975c94f7a4fbf6eea486e12d2a7b944f1b3837ebd72a45a0896a519c8.cairo"
+                                            "filename": "autogen/starknet/external/__execute__/fda2b8aa49b29c30228f00b8e9823863453031a1abe9ca64b44c8468cfa74e87.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 87,
+                                                "end_line": 86,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 87
+                                                "start_line": 86
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -21951,7 +21031,7 @@
                                     "While auto generating local variable for 'syscall_ptr'."
                                 ],
                                 "start_col": 6,
-                                "start_line": 87
+                                "start_line": 86
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -21959,7 +21039,7 @@
                         "start_line": 1
                     }
                 },
-                "726": {
+                "694": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -21972,12 +21052,12 @@
                         "end_col": 82,
                         "end_line": 1,
                         "input_file": {
-                            "filename": "autogen/starknet/external/__execute__/5eddd16975c94f7a4fbf6eea486e12d2a7b944f1b3837ebd72a45a0896a519c8.cairo"
+                            "filename": "autogen/starknet/external/__execute__/fda2b8aa49b29c30228f00b8e9823863453031a1abe9ca64b44c8468cfa74e87.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 17,
-                                "end_line": 87,
+                                "end_line": 86,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -21986,17 +21066,17 @@
                                         "end_col": 82,
                                         "end_line": 1,
                                         "input_file": {
-                                            "filename": "autogen/starknet/external/__execute__/5eddd16975c94f7a4fbf6eea486e12d2a7b944f1b3837ebd72a45a0896a519c8.cairo"
+                                            "filename": "autogen/starknet/external/__execute__/fda2b8aa49b29c30228f00b8e9823863453031a1abe9ca64b44c8468cfa74e87.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 87,
+                                                "end_line": 86,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 87
+                                                "start_line": 86
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -22006,7 +21086,7 @@
                                     "While auto generating local variable for 'pedersen_ptr'."
                                 ],
                                 "start_col": 6,
-                                "start_line": 87
+                                "start_line": 86
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -22014,7 +21094,7 @@
                         "start_line": 1
                     }
                 },
-                "727": {
+                "695": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -22024,52 +21104,52 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 136,
+                        "end_col": 103,
                         "end_line": 1,
                         "input_file": {
-                            "filename": "autogen/starknet/external/__execute__/5eddd16975c94f7a4fbf6eea486e12d2a7b944f1b3837ebd72a45a0896a519c8.cairo"
+                            "filename": "autogen/starknet/external/__execute__/fda2b8aa49b29c30228f00b8e9823863453031a1abe9ca64b44c8468cfa74e87.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 17,
-                                "end_line": 87,
+                                "end_line": 86,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 136,
+                                        "end_col": 103,
                                         "end_line": 1,
                                         "input_file": {
-                                            "filename": "autogen/starknet/external/__execute__/5eddd16975c94f7a4fbf6eea486e12d2a7b944f1b3837ebd72a45a0896a519c8.cairo"
+                                            "filename": "autogen/starknet/external/__execute__/fda2b8aa49b29c30228f00b8e9823863453031a1abe9ca64b44c8468cfa74e87.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 87,
+                                                "end_line": 86,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 87
+                                                "start_line": 86
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
-                                        "start_col": 127,
+                                        "start_col": 94,
                                         "start_line": 1
                                     },
                                     "While auto generating local variable for 'ecdsa_ptr'."
                                 ],
                                 "start_col": 6,
-                                "start_line": 87
+                                "start_line": 86
                             },
                             "While constructing the external wrapper for:"
                         ],
-                        "start_col": 127,
+                        "start_col": 94,
                         "start_line": 1
                     }
                 },
-                "728": {
+                "696": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -22079,52 +21159,52 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 161,
+                        "end_col": 128,
                         "end_line": 1,
                         "input_file": {
-                            "filename": "autogen/starknet/external/__execute__/5eddd16975c94f7a4fbf6eea486e12d2a7b944f1b3837ebd72a45a0896a519c8.cairo"
+                            "filename": "autogen/starknet/external/__execute__/fda2b8aa49b29c30228f00b8e9823863453031a1abe9ca64b44c8468cfa74e87.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 17,
-                                "end_line": 87,
+                                "end_line": 86,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 161,
+                                        "end_col": 128,
                                         "end_line": 1,
                                         "input_file": {
-                                            "filename": "autogen/starknet/external/__execute__/5eddd16975c94f7a4fbf6eea486e12d2a7b944f1b3837ebd72a45a0896a519c8.cairo"
+                                            "filename": "autogen/starknet/external/__execute__/fda2b8aa49b29c30228f00b8e9823863453031a1abe9ca64b44c8468cfa74e87.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 87,
+                                                "end_line": 86,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 87
+                                                "start_line": 86
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
-                                        "start_col": 150,
+                                        "start_col": 117,
                                         "start_line": 1
                                     },
                                     "While auto generating local variable for 'bitwise_ptr'."
                                 ],
                                 "start_col": 6,
-                                "start_line": 87
+                                "start_line": 86
                             },
                             "While constructing the external wrapper for:"
                         ],
-                        "start_col": 150,
+                        "start_col": 117,
                         "start_line": 1
                     }
                 },
-                "729": {
+                "697": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -22134,15 +21214,15 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 115,
+                        "end_col": 161,
                         "end_line": 1,
                         "input_file": {
-                            "filename": "autogen/starknet/external/__execute__/5eddd16975c94f7a4fbf6eea486e12d2a7b944f1b3837ebd72a45a0896a519c8.cairo"
+                            "filename": "autogen/starknet/external/__execute__/fda2b8aa49b29c30228f00b8e9823863453031a1abe9ca64b44c8468cfa74e87.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 17,
-                                "end_line": 87,
+                                "end_line": 86,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -22151,17 +21231,17 @@
                                         "end_col": 100,
                                         "end_line": 2,
                                         "input_file": {
-                                            "filename": "autogen/starknet/external/__execute__/5eddd16975c94f7a4fbf6eea486e12d2a7b944f1b3837ebd72a45a0896a519c8.cairo"
+                                            "filename": "autogen/starknet/external/__execute__/fda2b8aa49b29c30228f00b8e9823863453031a1abe9ca64b44c8468cfa74e87.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 87,
+                                                "end_line": 86,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 87
+                                                "start_line": 86
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -22171,15 +21251,15 @@
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 87
+                                "start_line": 86
                             },
                             "While constructing the external wrapper for:"
                         ],
-                        "start_col": 100,
+                        "start_col": 146,
                         "start_line": 1
                     }
                 },
-                "730": {
+                "698": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -22192,17 +21272,17 @@
                         "end_col": 101,
                         "end_line": 2,
                         "input_file": {
-                            "filename": "autogen/starknet/external/__execute__/5eddd16975c94f7a4fbf6eea486e12d2a7b944f1b3837ebd72a45a0896a519c8.cairo"
+                            "filename": "autogen/starknet/external/__execute__/fda2b8aa49b29c30228f00b8e9823863453031a1abe9ca64b44c8468cfa74e87.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 17,
-                                "end_line": 87,
+                                "end_line": 86,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 87
+                                "start_line": 86
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -22210,7 +21290,7 @@
                         "start_line": 2
                     }
                 },
-                "732": {
+                "700": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -22223,12 +21303,12 @@
                         "end_col": 55,
                         "end_line": 1,
                         "input_file": {
-                            "filename": "autogen/starknet/external/__execute__/5eddd16975c94f7a4fbf6eea486e12d2a7b944f1b3837ebd72a45a0896a519c8.cairo"
+                            "filename": "autogen/starknet/external/__execute__/fda2b8aa49b29c30228f00b8e9823863453031a1abe9ca64b44c8468cfa74e87.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 17,
-                                "end_line": 87,
+                                "end_line": 86,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -22237,12 +21317,12 @@
                                         "end_col": 55,
                                         "end_line": 1,
                                         "input_file": {
-                                            "filename": "autogen/starknet/external/__execute__/5eddd16975c94f7a4fbf6eea486e12d2a7b944f1b3837ebd72a45a0896a519c8.cairo"
+                                            "filename": "autogen/starknet/external/__execute__/fda2b8aa49b29c30228f00b8e9823863453031a1abe9ca64b44c8468cfa74e87.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 87,
+                                                "end_line": 86,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
@@ -22256,12 +21336,12 @@
                                                         "parent_location": [
                                                             {
                                                                 "end_col": 17,
-                                                                "end_line": 87,
+                                                                "end_line": 86,
                                                                 "input_file": {
                                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                                 },
                                                                 "start_col": 6,
-                                                                "start_line": 87
+                                                                "start_line": 86
                                                             },
                                                             "While constructing the external wrapper for:"
                                                         ],
@@ -22271,7 +21351,7 @@
                                                     "While expanding the reference 'syscall_ptr' in:"
                                                 ],
                                                 "start_col": 6,
-                                                "start_line": 87
+                                                "start_line": 86
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -22281,7 +21361,7 @@
                                     "While auto generating local variable for 'syscall_ptr'."
                                 ],
                                 "start_col": 6,
-                                "start_line": 87
+                                "start_line": 86
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -22289,7 +21369,7 @@
                         "start_line": 1
                     }
                 },
-                "733": {
+                "701": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -22302,12 +21382,12 @@
                         "end_col": 82,
                         "end_line": 1,
                         "input_file": {
-                            "filename": "autogen/starknet/external/__execute__/5eddd16975c94f7a4fbf6eea486e12d2a7b944f1b3837ebd72a45a0896a519c8.cairo"
+                            "filename": "autogen/starknet/external/__execute__/fda2b8aa49b29c30228f00b8e9823863453031a1abe9ca64b44c8468cfa74e87.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 17,
-                                "end_line": 87,
+                                "end_line": 86,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -22316,12 +21396,12 @@
                                         "end_col": 82,
                                         "end_line": 1,
                                         "input_file": {
-                                            "filename": "autogen/starknet/external/__execute__/5eddd16975c94f7a4fbf6eea486e12d2a7b944f1b3837ebd72a45a0896a519c8.cairo"
+                                            "filename": "autogen/starknet/external/__execute__/fda2b8aa49b29c30228f00b8e9823863453031a1abe9ca64b44c8468cfa74e87.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 87,
+                                                "end_line": 86,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
@@ -22335,12 +21415,12 @@
                                                         "parent_location": [
                                                             {
                                                                 "end_col": 17,
-                                                                "end_line": 87,
+                                                                "end_line": 86,
                                                                 "input_file": {
                                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                                 },
                                                                 "start_col": 6,
-                                                                "start_line": 87
+                                                                "start_line": 86
                                                             },
                                                             "While constructing the external wrapper for:"
                                                         ],
@@ -22350,7 +21430,7 @@
                                                     "While expanding the reference 'pedersen_ptr' in:"
                                                 ],
                                                 "start_col": 6,
-                                                "start_line": 87
+                                                "start_line": 86
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -22360,7 +21440,7 @@
                                     "While auto generating local variable for 'pedersen_ptr'."
                                 ],
                                 "start_col": 6,
-                                "start_line": 87
+                                "start_line": 86
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -22368,7 +21448,7 @@
                         "start_line": 1
                     }
                 },
-                "734": {
+                "702": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -22381,12 +21461,12 @@
                         "end_col": 21,
                         "end_line": 2,
                         "input_file": {
-                            "filename": "autogen/starknet/external/__execute__/5eddd16975c94f7a4fbf6eea486e12d2a7b944f1b3837ebd72a45a0896a519c8.cairo"
+                            "filename": "autogen/starknet/external/__execute__/fda2b8aa49b29c30228f00b8e9823863453031a1abe9ca64b44c8468cfa74e87.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 17,
-                                "end_line": 87,
+                                "end_line": 86,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -22400,12 +21480,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 87,
+                                                "end_line": 86,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 87
+                                                "start_line": 86
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -22415,7 +21495,7 @@
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 87
+                                "start_line": 86
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -22423,7 +21503,7 @@
                         "start_line": 2
                     }
                 },
-                "735": {
+                "703": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -22433,29 +21513,29 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 136,
+                        "end_col": 103,
                         "end_line": 1,
                         "input_file": {
-                            "filename": "autogen/starknet/external/__execute__/5eddd16975c94f7a4fbf6eea486e12d2a7b944f1b3837ebd72a45a0896a519c8.cairo"
+                            "filename": "autogen/starknet/external/__execute__/fda2b8aa49b29c30228f00b8e9823863453031a1abe9ca64b44c8468cfa74e87.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 17,
-                                "end_line": 87,
+                                "end_line": 86,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 136,
+                                        "end_col": 103,
                                         "end_line": 1,
                                         "input_file": {
-                                            "filename": "autogen/starknet/external/__execute__/5eddd16975c94f7a4fbf6eea486e12d2a7b944f1b3837ebd72a45a0896a519c8.cairo"
+                                            "filename": "autogen/starknet/external/__execute__/fda2b8aa49b29c30228f00b8e9823863453031a1abe9ca64b44c8468cfa74e87.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 87,
+                                                "end_line": 86,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
@@ -22469,12 +21549,12 @@
                                                         "parent_location": [
                                                             {
                                                                 "end_col": 17,
-                                                                "end_line": 87,
+                                                                "end_line": 86,
                                                                 "input_file": {
                                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                                 },
                                                                 "start_col": 6,
-                                                                "start_line": 87
+                                                                "start_line": 86
                                                             },
                                                             "While constructing the external wrapper for:"
                                                         ],
@@ -22484,25 +21564,25 @@
                                                     "While expanding the reference 'ecdsa_ptr' in:"
                                                 ],
                                                 "start_col": 6,
-                                                "start_line": 87
+                                                "start_line": 86
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
-                                        "start_col": 127,
+                                        "start_col": 94,
                                         "start_line": 1
                                     },
                                     "While auto generating local variable for 'ecdsa_ptr'."
                                 ],
                                 "start_col": 6,
-                                "start_line": 87
+                                "start_line": 86
                             },
                             "While constructing the external wrapper for:"
                         ],
-                        "start_col": 127,
+                        "start_col": 94,
                         "start_line": 1
                     }
                 },
-                "736": {
+                "704": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -22512,29 +21592,29 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 161,
+                        "end_col": 128,
                         "end_line": 1,
                         "input_file": {
-                            "filename": "autogen/starknet/external/__execute__/5eddd16975c94f7a4fbf6eea486e12d2a7b944f1b3837ebd72a45a0896a519c8.cairo"
+                            "filename": "autogen/starknet/external/__execute__/fda2b8aa49b29c30228f00b8e9823863453031a1abe9ca64b44c8468cfa74e87.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 17,
-                                "end_line": 87,
+                                "end_line": 86,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 161,
+                                        "end_col": 128,
                                         "end_line": 1,
                                         "input_file": {
-                                            "filename": "autogen/starknet/external/__execute__/5eddd16975c94f7a4fbf6eea486e12d2a7b944f1b3837ebd72a45a0896a519c8.cairo"
+                                            "filename": "autogen/starknet/external/__execute__/fda2b8aa49b29c30228f00b8e9823863453031a1abe9ca64b44c8468cfa74e87.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 87,
+                                                "end_line": 86,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
@@ -22548,12 +21628,12 @@
                                                         "parent_location": [
                                                             {
                                                                 "end_col": 17,
-                                                                "end_line": 87,
+                                                                "end_line": 86,
                                                                 "input_file": {
                                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                                 },
                                                                 "start_col": 6,
-                                                                "start_line": 87
+                                                                "start_line": 86
                                                             },
                                                             "While constructing the external wrapper for:"
                                                         ],
@@ -22563,25 +21643,25 @@
                                                     "While expanding the reference 'bitwise_ptr' in:"
                                                 ],
                                                 "start_col": 6,
-                                                "start_line": 87
+                                                "start_line": 86
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
-                                        "start_col": 150,
+                                        "start_col": 117,
                                         "start_line": 1
                                     },
                                     "While auto generating local variable for 'bitwise_ptr'."
                                 ],
                                 "start_col": 6,
-                                "start_line": 87
+                                "start_line": 86
                             },
                             "While constructing the external wrapper for:"
                         ],
-                        "start_col": 150,
+                        "start_col": 117,
                         "start_line": 1
                     }
                 },
-                "737": {
+                "705": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -22594,12 +21674,12 @@
                         "end_col": 35,
                         "end_line": 2,
                         "input_file": {
-                            "filename": "autogen/starknet/external/__execute__/5eddd16975c94f7a4fbf6eea486e12d2a7b944f1b3837ebd72a45a0896a519c8.cairo"
+                            "filename": "autogen/starknet/external/__execute__/fda2b8aa49b29c30228f00b8e9823863453031a1abe9ca64b44c8468cfa74e87.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 17,
-                                "end_line": 87,
+                                "end_line": 86,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -22613,12 +21693,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 87,
+                                                "end_line": 86,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 87
+                                                "start_line": 86
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -22628,7 +21708,7 @@
                                     "While expanding the reference 'retdata_size' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 87
+                                "start_line": 86
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -22636,7 +21716,7 @@
                         "start_line": 2
                     }
                 },
-                "738": {
+                "706": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -22649,12 +21729,12 @@
                         "end_col": 44,
                         "end_line": 2,
                         "input_file": {
-                            "filename": "autogen/starknet/external/__execute__/5eddd16975c94f7a4fbf6eea486e12d2a7b944f1b3837ebd72a45a0896a519c8.cairo"
+                            "filename": "autogen/starknet/external/__execute__/fda2b8aa49b29c30228f00b8e9823863453031a1abe9ca64b44c8468cfa74e87.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 17,
-                                "end_line": 87,
+                                "end_line": 86,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -22668,12 +21748,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 87,
+                                                "end_line": 86,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 87
+                                                "start_line": 86
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -22683,7 +21763,7 @@
                                     "While expanding the reference 'retdata' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 87
+                                "start_line": 86
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -22691,7 +21771,7 @@
                         "start_line": 2
                     }
                 },
-                "739": {
+                "707": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -22709,12 +21789,12 @@
                         "parent_location": [
                             {
                                 "end_col": 17,
-                                "end_line": 87,
+                                "end_line": 86,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 87
+                                "start_line": 86
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -22741,7 +21821,7 @@
                     }
                 }
             ],
-            "12": [
+            "6": [
                 {
                     "accessible_scopes": [
                         "starkware.cairo.common.memcpy",
@@ -22750,7 +21830,7 @@
                     "code": "vm_enter_scope({'n': ids.len})",
                     "flow_tracking_data": {
                         "ap_tracking": {
-                            "group": 2,
+                            "group": 1,
                             "offset": 0
                         },
                         "reference_ids": {
@@ -22759,7 +21839,7 @@
                     }
                 }
             ],
-            "20": [
+            "14": [
                 {
                     "accessible_scopes": [
                         "starkware.cairo.common.memcpy",
@@ -22768,7 +21848,7 @@
                     "code": "n -= 1\nids.continue_copying = 1 if n > 0 else 0",
                     "flow_tracking_data": {
                         "ap_tracking": {
-                            "group": 2,
+                            "group": 1,
                             "offset": 5
                         },
                         "reference_ids": {
@@ -22777,7 +21857,7 @@
                     }
                 }
             ],
-            "23": [
+            "17": [
                 {
                     "accessible_scopes": [
                         "starkware.cairo.common.memcpy",
@@ -22786,91 +21866,101 @@
                     "code": "vm_exit_scope()",
                     "flow_tracking_data": {
                         "ap_tracking": {
-                            "group": 2,
+                            "group": 1,
                             "offset": 6
                         },
                         "reference_ids": {}
                     }
                 }
             ],
-            "24": [
+            "18": [
                 {
                     "accessible_scopes": [
                         "starkware.cairo.common.math",
-                        "starkware.cairo.common.math.assert_not_equal"
+                        "starkware.cairo.common.math.assert_le_felt"
                     ],
-                    "code": "from starkware.cairo.lang.vm.relocatable import RelocatableValue\nboth_ints = isinstance(ids.a, int) and isinstance(ids.b, int)\nboth_relocatable = (\n    isinstance(ids.a, RelocatableValue) and isinstance(ids.b, RelocatableValue) and\n    ids.a.segment_index == ids.b.segment_index)\nassert both_ints or both_relocatable, \\\n    f'assert_not_equal failed: non-comparable values: {ids.a}, {ids.b}.'\nassert (ids.a - ids.b) % PRIME != 0, f'assert_not_equal failed: {ids.a} = {ids.b}.'",
+                    "code": "import itertools\n\nfrom starkware.cairo.common.math_utils import assert_integer\nassert_integer(ids.a)\nassert_integer(ids.b)\na = ids.a % PRIME\nb = ids.b % PRIME\nassert a <= b, f'a = {a} is not less than or equal to b = {b}.'\n\n# Find an arc less than PRIME / 3, and another less than PRIME / 2.\nlengths_and_indices = [(a, 0), (b - a, 1), (PRIME - 1 - b, 2)]\nlengths_and_indices.sort()\nassert lengths_and_indices[0][0] <= PRIME // 3 and lengths_and_indices[1][0] <= PRIME // 2\nexcluded = lengths_and_indices[2][1]\n\nmemory[ids.range_check_ptr + 1], memory[ids.range_check_ptr + 0] = (\n    divmod(lengths_and_indices[0][0], ids.PRIME_OVER_3_HIGH))\nmemory[ids.range_check_ptr + 3], memory[ids.range_check_ptr + 2] = (\n    divmod(lengths_and_indices[1][0], ids.PRIME_OVER_2_HIGH))",
                     "flow_tracking_data": {
                         "ap_tracking": {
-                            "group": 3,
+                            "group": 2,
                             "offset": 0
                         },
                         "reference_ids": {
-                            "starkware.cairo.common.math.assert_not_equal.a": 2,
-                            "starkware.cairo.common.math.assert_not_equal.b": 3
+                            "starkware.cairo.common.math.assert_le_felt.a": 2,
+                            "starkware.cairo.common.math.assert_le_felt.b": 3,
+                            "starkware.cairo.common.math.assert_le_felt.range_check_ptr": 4
                         }
                     }
                 }
             ],
-            "30": [
+            "28": [
                 {
                     "accessible_scopes": [
                         "starkware.cairo.common.math",
-                        "starkware.cairo.common.math.assert_250_bit"
+                        "starkware.cairo.common.math.assert_le_felt"
                     ],
-                    "code": "from starkware.cairo.common.math_utils import as_int\n\n# Correctness check.\nvalue = as_int(ids.value, PRIME) % PRIME\nassert value < ids.UPPER_BOUND, f'{value} is outside of the range [0, 2**250).'\n\n# Calculation for the assertion.\nids.high, ids.low = divmod(ids.value, ids.SHIFT)",
+                    "code": "memory[ap] = 1 if excluded != 0 else 0",
                     "flow_tracking_data": {
                         "ap_tracking": {
-                            "group": 4,
-                            "offset": 0
+                            "group": 2,
+                            "offset": 8
                         },
-                        "reference_ids": {
-                            "starkware.cairo.common.math.assert_250_bit.high": 6,
-                            "starkware.cairo.common.math.assert_250_bit.low": 5,
-                            "starkware.cairo.common.math.assert_250_bit.value": 4
-                        }
+                        "reference_ids": {}
                     }
                 }
             ],
-            "45": [
+            "42": [
                 {
                     "accessible_scopes": [
-                        "starkware.starknet.common.storage",
-                        "starkware.starknet.common.storage.normalize_address"
+                        "starkware.cairo.common.math",
+                        "starkware.cairo.common.math.assert_le_felt"
                     ],
-                    "code": "# Verify the assumptions on the relationship between 2**250, ADDR_BOUND and PRIME.\nADDR_BOUND = ids.ADDR_BOUND % PRIME\nassert (2**250 < ADDR_BOUND <= 2**251) and (2 * 2**250 < PRIME) and (\n        ADDR_BOUND * 2 > PRIME), \\\n    'normalize_address() cannot be used with the current constants.'\nids.is_small = 1 if ids.addr < ADDR_BOUND else 0",
+                    "code": "memory[ap] = 1 if excluded != 1 else 0",
                     "flow_tracking_data": {
                         "ap_tracking": {
-                            "group": 5,
-                            "offset": 1
+                            "group": 2,
+                            "offset": 9
                         },
-                        "reference_ids": {
-                            "starkware.starknet.common.storage.normalize_address.addr": 7,
-                            "starkware.starknet.common.storage.normalize_address.is_small": 8
-                        }
+                        "reference_ids": {}
+                    }
+                }
+            ],
+            "54": [
+                {
+                    "accessible_scopes": [
+                        "starkware.cairo.common.math",
+                        "starkware.cairo.common.math.assert_le_felt"
+                    ],
+                    "code": "assert excluded == 2",
+                    "flow_tracking_data": {
+                        "ap_tracking": {
+                            "group": 2,
+                            "offset": 10
+                        },
+                        "reference_ids": {}
                     }
                 }
             ],
             "63": [
                 {
                     "accessible_scopes": [
-                        "starkware.starknet.common.storage",
-                        "starkware.starknet.common.storage.normalize_address"
+                        "starkware.cairo.common.math",
+                        "starkware.cairo.common.math.assert_lt_felt"
                     ],
-                    "code": "ids.is_250 = 1 if ids.addr < 2**250 else 0",
+                    "code": "from starkware.cairo.common.math_utils import assert_integer\nassert_integer(ids.a)\nassert_integer(ids.b)\nassert (ids.a % PRIME) < (ids.b % PRIME), \\\n    f'a = {ids.a % PRIME} is not less than b = {ids.b % PRIME}.'",
                     "flow_tracking_data": {
                         "ap_tracking": {
-                            "group": 5,
-                            "offset": 2
+                            "group": 3,
+                            "offset": 0
                         },
                         "reference_ids": {
-                            "starkware.starknet.common.storage.normalize_address.addr": 7,
-                            "starkware.starknet.common.storage.normalize_address.is_250": 9
+                            "starkware.cairo.common.math.assert_lt_felt.a": 5,
+                            "starkware.cairo.common.math.assert_lt_felt.b": 6
                         }
                     }
                 }
             ],
-            "90": [
+            "81": [
                 {
                     "accessible_scopes": [
                         "starkware.starknet.common.syscalls",
@@ -22879,16 +21969,16 @@
                     "code": "syscall_handler.call_contract(segments=segments, syscall_ptr=ids.syscall_ptr)",
                     "flow_tracking_data": {
                         "ap_tracking": {
-                            "group": 6,
+                            "group": 4,
                             "offset": 1
                         },
                         "reference_ids": {
-                            "starkware.starknet.common.syscalls.call_contract.syscall_ptr": 10
+                            "starkware.starknet.common.syscalls.call_contract.syscall_ptr": 7
                         }
                     }
                 }
             ],
-            "98": [
+            "89": [
                 {
                     "accessible_scopes": [
                         "starkware.starknet.common.syscalls",
@@ -22897,16 +21987,16 @@
                     "code": "syscall_handler.get_caller_address(segments=segments, syscall_ptr=ids.syscall_ptr)",
                     "flow_tracking_data": {
                         "ap_tracking": {
-                            "group": 7,
+                            "group": 5,
                             "offset": 1
                         },
                         "reference_ids": {
-                            "starkware.starknet.common.syscalls.get_caller_address.syscall_ptr": 11
+                            "starkware.starknet.common.syscalls.get_caller_address.syscall_ptr": 8
                         }
                     }
                 }
             ],
-            "105": [
+            "96": [
                 {
                     "accessible_scopes": [
                         "starkware.starknet.common.syscalls",
@@ -22915,16 +22005,16 @@
                     "code": "syscall_handler.get_contract_address(segments=segments, syscall_ptr=ids.syscall_ptr)",
                     "flow_tracking_data": {
                         "ap_tracking": {
-                            "group": 8,
+                            "group": 6,
                             "offset": 1
                         },
                         "reference_ids": {
-                            "starkware.starknet.common.syscalls.get_contract_address.syscall_ptr": 12
+                            "starkware.starknet.common.syscalls.get_contract_address.syscall_ptr": 9
                         }
                     }
                 }
             ],
-            "113": [
+            "104": [
                 {
                     "accessible_scopes": [
                         "starkware.starknet.common.syscalls",
@@ -22933,16 +22023,16 @@
                     "code": "syscall_handler.storage_read(segments=segments, syscall_ptr=ids.syscall_ptr)",
                     "flow_tracking_data": {
                         "ap_tracking": {
-                            "group": 9,
+                            "group": 7,
                             "offset": 1
                         },
                         "reference_ids": {
-                            "starkware.starknet.common.syscalls.storage_read.syscall_ptr": 13
+                            "starkware.starknet.common.syscalls.storage_read.syscall_ptr": 10
                         }
                     }
                 }
             ],
-            "122": [
+            "113": [
                 {
                     "accessible_scopes": [
                         "starkware.starknet.common.syscalls",
@@ -22951,16 +22041,16 @@
                     "code": "syscall_handler.storage_write(segments=segments, syscall_ptr=ids.syscall_ptr)",
                     "flow_tracking_data": {
                         "ap_tracking": {
-                            "group": 10,
+                            "group": 8,
                             "offset": 1
                         },
                         "reference_ids": {
-                            "starkware.starknet.common.syscalls.storage_write.syscall_ptr": 14
+                            "starkware.starknet.common.syscalls.storage_write.syscall_ptr": 11
                         }
                     }
                 }
             ],
-            "128": [
+            "119": [
                 {
                     "accessible_scopes": [
                         "starkware.starknet.common.syscalls",
@@ -22969,16 +22059,16 @@
                     "code": "syscall_handler.get_tx_info(segments=segments, syscall_ptr=ids.syscall_ptr)",
                     "flow_tracking_data": {
                         "ap_tracking": {
-                            "group": 11,
+                            "group": 9,
                             "offset": 1
                         },
                         "reference_ids": {
-                            "starkware.starknet.common.syscalls.get_tx_info.syscall_ptr": 15
+                            "starkware.starknet.common.syscalls.get_tx_info.syscall_ptr": 12
                         }
                     }
                 }
             ],
-            "132": [
+            "123": [
                 {
                     "accessible_scopes": [
                         "starkware.cairo.common.signature",
@@ -22987,18 +22077,37 @@
                     "code": "ecdsa_builtin.add_signature(ids.ecdsa_ptr.address_, (ids.signature_r, ids.signature_s))",
                     "flow_tracking_data": {
                         "ap_tracking": {
-                            "group": 12,
+                            "group": 10,
+                            "offset": 0
+                        },
+                        "reference_ids": {
+                            "starkware.cairo.common.signature.verify_ecdsa_signature.ecdsa_ptr": 15,
+                            "starkware.cairo.common.signature.verify_ecdsa_signature.signature_r": 13,
+                            "starkware.cairo.common.signature.verify_ecdsa_signature.signature_s": 14
+                        }
+                    }
+                }
+            ],
+            "128": [
+                {
+                    "accessible_scopes": [
+                        "starkware.cairo.common.math_cmp",
+                        "starkware.cairo.common.math_cmp.is_le_felt"
+                    ],
+                    "code": "memory[ap] = 0 if (ids.a % PRIME) <= (ids.b % PRIME) else 1",
+                    "flow_tracking_data": {
+                        "ap_tracking": {
+                            "group": 11,
                             "offset": 0
                         },
                         "reference_ids": {
-                            "starkware.cairo.common.signature.verify_ecdsa_signature.ecdsa_ptr": 18,
-                            "starkware.cairo.common.signature.verify_ecdsa_signature.signature_r": 16,
-                            "starkware.cairo.common.signature.verify_ecdsa_signature.signature_s": 17
+                            "starkware.cairo.common.math_cmp.is_le_felt.a": 16,
+                            "starkware.cairo.common.math_cmp.is_le_felt.b": 17
                         }
                     }
                 }
             ],
-            "407": [
+            "375": [
                 {
                     "accessible_scopes": [
                         "__main__",
@@ -23009,14 +22118,14 @@
                     "code": "memory[ap] = segments.add()",
                     "flow_tracking_data": {
                         "ap_tracking": {
-                            "group": 35,
-                            "offset": 103
+                            "group": 30,
+                            "offset": 35
                         },
                         "reference_ids": {}
                     }
                 }
             ],
-            "424": [
+            "392": [
                 {
                     "accessible_scopes": [
                         "__main__",
@@ -23027,14 +22136,14 @@
                     "code": "memory[ap] = segments.add()",
                     "flow_tracking_data": {
                         "ap_tracking": {
-                            "group": 37,
+                            "group": 32,
                             "offset": 0
                         },
                         "reference_ids": {}
                     }
                 }
             ],
-            "457": [
+            "425": [
                 {
                     "accessible_scopes": [
                         "__main__",
@@ -23045,14 +22154,14 @@
                     "code": "memory[ap] = segments.add()",
                     "flow_tracking_data": {
                         "ap_tracking": {
-                            "group": 41,
+                            "group": 36,
                             "offset": 0
                         },
                         "reference_ids": {}
                     }
                 }
             ],
-            "502": [
+            "470": [
                 {
                     "accessible_scopes": [
                         "__main__",
@@ -23063,14 +22172,14 @@
                     "code": "memory[ap] = segments.add()",
                     "flow_tracking_data": {
                         "ap_tracking": {
-                            "group": 45,
+                            "group": 40,
                             "offset": 50
                         },
                         "reference_ids": {}
                     }
                 }
             ],
-            "523": [
+            "491": [
                 {
                     "accessible_scopes": [
                         "__main__",
@@ -23081,14 +22190,14 @@
                     "code": "memory[ap] = segments.add()",
                     "flow_tracking_data": {
                         "ap_tracking": {
-                            "group": 47,
+                            "group": 42,
                             "offset": 0
                         },
                         "reference_ids": {}
                     }
                 }
             ],
-            "611": [
+            "579": [
                 {
                     "accessible_scopes": [
                         "__main__",
@@ -23099,14 +22208,14 @@
                     "code": "memory[ap] = segments.add()",
                     "flow_tracking_data": {
                         "ap_tracking": {
-                            "group": 50,
+                            "group": 45,
                             "offset": 77
                         },
                         "reference_ids": {}
                     }
                 }
             ],
-            "649": [
+            "617": [
                 {
                     "accessible_scopes": [
                         "__main__",
@@ -23117,14 +22226,14 @@
                     "code": "memory[ap] = segments.add()",
                     "flow_tracking_data": {
                         "ap_tracking": {
-                            "group": 52,
+                            "group": 47,
                             "offset": 63
                         },
                         "reference_ids": {}
                     }
                 }
             ],
-            "672": [
+            "640": [
                 {
                     "accessible_scopes": [
                         "__main__",
@@ -23135,7 +22244,7 @@
                     "code": "memory[ap] = segments.add()",
                     "flow_tracking_data": {
                         "ap_tracking": {
-                            "group": 55,
+                            "group": 50,
                             "offset": 0
                         },
                         "reference_ids": {}
@@ -23156,10 +22265,6 @@
                 "destination": "starkware.cairo.common.cairo_builtins.BitwiseBuiltin",
                 "type": "alias"
             },
-            "__main__.ERC165": {
-                "destination": "openzeppelin.introspection.erc165.library.ERC165",
-                "type": "alias"
-            },
             "__main__.HashBuiltin": {
                 "destination": "starkware.cairo.common.cairo_builtins.HashBuiltin",
                 "type": "alias"
@@ -23172,7 +22277,7 @@
                 "decorators": [
                     "external"
                 ],
-                "pc": 660,
+                "pc": 628,
                 "type": "function"
             },
             "__main__.__execute__.Args": {
@@ -23203,11 +22308,11 @@
                 "members": {
                     "bitwise_ptr": {
                         "cairo_type": "starkware.cairo.common.cairo_builtins.BitwiseBuiltin*",
-                        "offset": 4
+                        "offset": 3
                     },
                     "ecdsa_ptr": {
                         "cairo_type": "starkware.cairo.common.cairo_builtins.SignatureBuiltin*",
-                        "offset": 3
+                        "offset": 2
                     },
                     "pedersen_ptr": {
                         "cairo_type": "starkware.cairo.common.cairo_builtins.HashBuiltin*",
@@ -23215,7 +22320,7 @@
                     },
                     "range_check_ptr": {
                         "cairo_type": "felt",
-                        "offset": 2
+                        "offset": 4
                     },
                     "syscall_ptr": {
                         "cairo_type": "felt*",
@@ -23237,7 +22342,7 @@
                 "decorators": [
                     "external"
                 ],
-                "pc": 563,
+                "pc": 531,
                 "type": "function"
             },
             "__main__.__validate__.Args": {
@@ -23268,7 +22373,7 @@
                 "members": {
                     "ecdsa_ptr": {
                         "cairo_type": "starkware.cairo.common.cairo_builtins.SignatureBuiltin*",
-                        "offset": 3
+                        "offset": 2
                     },
                     "pedersen_ptr": {
                         "cairo_type": "starkware.cairo.common.cairo_builtins.HashBuiltin*",
@@ -23276,7 +22381,7 @@
                     },
                     "range_check_ptr": {
                         "cairo_type": "felt",
-                        "offset": 2
+                        "offset": 3
                     },
                     "syscall_ptr": {
                         "cairo_type": "felt*",
@@ -23298,7 +22403,7 @@
                 "decorators": [
                     "external"
                 ],
-                "pc": 622,
+                "pc": 590,
                 "type": "function"
             },
             "__main__.__validate_declare__.Args": {
@@ -23317,7 +22422,7 @@
                 "members": {
                     "ecdsa_ptr": {
                         "cairo_type": "starkware.cairo.common.cairo_builtins.SignatureBuiltin*",
-                        "offset": 3
+                        "offset": 2
                     },
                     "pedersen_ptr": {
                         "cairo_type": "starkware.cairo.common.cairo_builtins.HashBuiltin*",
@@ -23325,7 +22430,7 @@
                     },
                     "range_check_ptr": {
                         "cairo_type": "felt",
-                        "offset": 2
+                        "offset": 3
                     },
                     "syscall_ptr": {
                         "cairo_type": "felt*",
@@ -23347,13 +22452,13 @@
                 "decorators": [
                     "constructor"
                 ],
-                "pc": 391,
+                "pc": 359,
                 "type": "function"
             },
             "__main__.constructor.Args": {
                 "full_name": "__main__.constructor.Args",
                 "members": {
-                    "public_key": {
+                    "publicKey": {
                         "cairo_type": "felt",
                         "offset": 0
                     }
@@ -23392,7 +22497,7 @@
                 "decorators": [
                     "view"
                 ],
-                "pc": 418,
+                "pc": 386,
                 "type": "function"
             },
             "__main__.getPublicKey.Args": {
@@ -23436,7 +22541,7 @@
                 "decorators": [
                     "view"
                 ],
-                "pc": 513,
+                "pc": 481,
                 "type": "function"
             },
             "__main__.isValidSignature.Args": {
@@ -23463,7 +22568,7 @@
                 "members": {
                     "ecdsa_ptr": {
                         "cairo_type": "starkware.cairo.common.cairo_builtins.SignatureBuiltin*",
-                        "offset": 3
+                        "offset": 2
                     },
                     "pedersen_ptr": {
                         "cairo_type": "starkware.cairo.common.cairo_builtins.HashBuiltin*",
@@ -23471,7 +22576,7 @@
                     },
                     "range_check_ptr": {
                         "cairo_type": "felt",
-                        "offset": 2
+                        "offset": 3
                     },
                     "syscall_ptr": {
                         "cairo_type": "felt*",
@@ -23493,7 +22598,7 @@
                 "decorators": [
                     "external"
                 ],
-                "pc": 486,
+                "pc": 454,
                 "type": "function"
             },
             "__main__.setPublicKey.Args": {
@@ -23538,7 +22643,7 @@
                 "decorators": [
                     "view"
                 ],
-                "pc": 450,
+                "pc": 418,
                 "type": "function"
             },
             "__main__.supportsInterface.Args": {
@@ -23583,7 +22688,7 @@
                 "decorators": [
                     "external"
                 ],
-                "pc": 691,
+                "pc": 659,
                 "type": "function"
             },
             "__wrappers__.__execute__.Args": {
@@ -23612,7 +22717,7 @@
             },
             "__wrappers__.__execute___encode_return": {
                 "decorators": [],
-                "pc": 672,
+                "pc": 640,
                 "type": "function"
             },
             "__wrappers__.__execute___encode_return.Args": {
@@ -23652,7 +22757,7 @@
                 "decorators": [
                     "external"
                 ],
-                "pc": 580,
+                "pc": 548,
                 "type": "function"
             },
             "__wrappers__.__validate__.Args": {
@@ -23687,7 +22792,7 @@
                 "decorators": [
                     "external"
                 ],
-                "pc": 639,
+                "pc": 607,
                 "type": "function"
             },
             "__wrappers__.__validate_declare__.Args": {
@@ -23722,7 +22827,7 @@
                 "decorators": [
                     "constructor"
                 ],
-                "pc": 398,
+                "pc": 366,
                 "type": "function"
             },
             "__wrappers__.constructor.Args": {
@@ -23757,7 +22862,7 @@
                 "decorators": [
                     "view"
                 ],
-                "pc": 433,
+                "pc": 401,
                 "type": "function"
             },
             "__wrappers__.getPublicKey.Args": {
@@ -23786,7 +22891,7 @@
             },
             "__wrappers__.getPublicKey_encode_return": {
                 "decorators": [],
-                "pc": 424,
+                "pc": 392,
                 "type": "function"
             },
             "__wrappers__.getPublicKey_encode_return.Args": {
@@ -23826,7 +22931,7 @@
                 "decorators": [
                     "view"
                 ],
-                "pc": 532,
+                "pc": 500,
                 "type": "function"
             },
             "__wrappers__.isValidSignature.Args": {
@@ -23855,7 +22960,7 @@
             },
             "__wrappers__.isValidSignature_encode_return": {
                 "decorators": [],
-                "pc": 523,
+                "pc": 491,
                 "type": "function"
             },
             "__wrappers__.isValidSignature_encode_return.Args": {
@@ -23895,7 +23000,7 @@
                 "decorators": [
                     "external"
                 ],
-                "pc": 493,
+                "pc": 461,
                 "type": "function"
             },
             "__wrappers__.setPublicKey.Args": {
@@ -23930,7 +23035,7 @@
                 "decorators": [
                     "view"
                 ],
-                "pc": 466,
+                "pc": 434,
                 "type": "function"
             },
             "__wrappers__.supportsInterface.Args": {
@@ -23959,7 +23064,7 @@
             },
             "__wrappers__.supportsInterface_encode_return": {
                 "decorators": [],
-                "pc": 457,
+                "pc": 425,
                 "type": "function"
             },
             "__wrappers__.supportsInterface_encode_return.Args": {
@@ -24020,7 +23125,7 @@
             },
             "openzeppelin.account.library.Account._execute_list": {
                 "decorators": [],
-                "pc": 333,
+                "pc": 301,
                 "type": "function"
             },
             "openzeppelin.account.library.Account._execute_list.Args": {
@@ -24063,7 +23168,7 @@
             },
             "openzeppelin.account.library.Account._from_call_array_to_call": {
                 "decorators": [],
-                "pc": 367,
+                "pc": 335,
                 "type": "function"
             },
             "openzeppelin.account.library.Account._from_call_array_to_call.Args": {
@@ -24110,7 +23215,7 @@
             },
             "openzeppelin.account.library.Account.assert_only_self": {
                 "decorators": [],
-                "pc": 250,
+                "pc": 185,
                 "type": "function"
             },
             "openzeppelin.account.library.Account.assert_only_self.Args": {
@@ -24120,371 +23225,100 @@
                 "type": "struct"
             },
             "openzeppelin.account.library.Account.assert_only_self.ImplicitArgs": {
-                "full_name": "openzeppelin.account.library.Account.assert_only_self.ImplicitArgs",
-                "members": {
-                    "syscall_ptr": {
-                        "cairo_type": "felt*",
-                        "offset": 0
-                    }
-                },
-                "size": 1,
-                "type": "struct"
-            },
-            "openzeppelin.account.library.Account.assert_only_self.Return": {
-                "cairo_type": "()",
-                "type": "type_definition"
-            },
-            "openzeppelin.account.library.Account.assert_only_self.SIZEOF_LOCALS": {
-                "type": "const",
-                "value": 0
-            },
-            "openzeppelin.account.library.Account.execute": {
-                "decorators": [],
-                "pc": 293,
-                "type": "function"
-            },
-            "openzeppelin.account.library.Account.execute.Args": {
-                "full_name": "openzeppelin.account.library.Account.execute.Args",
-                "members": {
-                    "call_array": {
-                        "cairo_type": "openzeppelin.account.library.AccountCallArray*",
-                        "offset": 1
-                    },
-                    "call_array_len": {
-                        "cairo_type": "felt",
-                        "offset": 0
-                    },
-                    "calldata": {
-                        "cairo_type": "felt*",
-                        "offset": 3
-                    },
-                    "calldata_len": {
-                        "cairo_type": "felt",
-                        "offset": 2
-                    }
-                },
-                "size": 4,
-                "type": "struct"
-            },
-            "openzeppelin.account.library.Account.execute.ImplicitArgs": {
-                "full_name": "openzeppelin.account.library.Account.execute.ImplicitArgs",
-                "members": {
-                    "bitwise_ptr": {
-                        "cairo_type": "starkware.cairo.common.cairo_builtins.BitwiseBuiltin*",
-                        "offset": 4
-                    },
-                    "ecdsa_ptr": {
-                        "cairo_type": "starkware.cairo.common.cairo_builtins.SignatureBuiltin*",
-                        "offset": 3
-                    },
-                    "pedersen_ptr": {
-                        "cairo_type": "starkware.cairo.common.cairo_builtins.HashBuiltin*",
-                        "offset": 1
-                    },
-                    "range_check_ptr": {
-                        "cairo_type": "felt",
-                        "offset": 2
-                    },
-                    "syscall_ptr": {
-                        "cairo_type": "felt*",
-                        "offset": 0
-                    }
-                },
-                "size": 5,
-                "type": "struct"
-            },
-            "openzeppelin.account.library.Account.execute.Return": {
-                "cairo_type": "(response_len: felt, response: felt*)",
-                "type": "type_definition"
-            },
-            "openzeppelin.account.library.Account.execute.SIZEOF_LOCALS": {
-                "type": "const",
-                "value": 2
-            },
-            "openzeppelin.account.library.Account.get_public_key": {
-                "decorators": [],
-                "pc": 259,
-                "type": "function"
-            },
-            "openzeppelin.account.library.Account.get_public_key.Args": {
-                "full_name": "openzeppelin.account.library.Account.get_public_key.Args",
-                "members": {},
-                "size": 0,
-                "type": "struct"
-            },
-            "openzeppelin.account.library.Account.get_public_key.ImplicitArgs": {
-                "full_name": "openzeppelin.account.library.Account.get_public_key.ImplicitArgs",
-                "members": {
-                    "pedersen_ptr": {
-                        "cairo_type": "starkware.cairo.common.cairo_builtins.HashBuiltin*",
-                        "offset": 1
-                    },
-                    "range_check_ptr": {
-                        "cairo_type": "felt",
-                        "offset": 2
-                    },
-                    "syscall_ptr": {
-                        "cairo_type": "felt*",
-                        "offset": 0
-                    }
-                },
-                "size": 3,
-                "type": "struct"
-            },
-            "openzeppelin.account.library.Account.get_public_key.Return": {
-                "cairo_type": "(public_key: felt)",
-                "type": "type_definition"
-            },
-            "openzeppelin.account.library.Account.get_public_key.SIZEOF_LOCALS": {
-                "type": "const",
-                "value": 0
-            },
-            "openzeppelin.account.library.Account.initializer": {
-                "decorators": [],
-                "pc": 239,
-                "type": "function"
-            },
-            "openzeppelin.account.library.Account.initializer.Args": {
-                "full_name": "openzeppelin.account.library.Account.initializer.Args",
-                "members": {
-                    "_public_key": {
-                        "cairo_type": "felt",
-                        "offset": 0
-                    }
-                },
-                "size": 1,
-                "type": "struct"
-            },
-            "openzeppelin.account.library.Account.initializer.ImplicitArgs": {
-                "full_name": "openzeppelin.account.library.Account.initializer.ImplicitArgs",
-                "members": {
-                    "pedersen_ptr": {
-                        "cairo_type": "starkware.cairo.common.cairo_builtins.HashBuiltin*",
-                        "offset": 1
-                    },
-                    "range_check_ptr": {
-                        "cairo_type": "felt",
-                        "offset": 2
-                    },
-                    "syscall_ptr": {
-                        "cairo_type": "felt*",
-                        "offset": 0
-                    }
-                },
-                "size": 3,
-                "type": "struct"
-            },
-            "openzeppelin.account.library.Account.initializer.Return": {
-                "cairo_type": "()",
-                "type": "type_definition"
-            },
-            "openzeppelin.account.library.Account.initializer.SIZEOF_LOCALS": {
-                "type": "const",
-                "value": 0
-            },
-            "openzeppelin.account.library.Account.is_valid_signature": {
-                "decorators": [],
-                "pc": 274,
-                "type": "function"
-            },
-            "openzeppelin.account.library.Account.is_valid_signature.Args": {
-                "full_name": "openzeppelin.account.library.Account.is_valid_signature.Args",
-                "members": {
-                    "hash": {
-                        "cairo_type": "felt",
-                        "offset": 0
-                    },
-                    "signature": {
-                        "cairo_type": "felt*",
-                        "offset": 2
-                    },
-                    "signature_len": {
-                        "cairo_type": "felt",
-                        "offset": 1
-                    }
-                },
-                "size": 3,
-                "type": "struct"
-            },
-            "openzeppelin.account.library.Account.is_valid_signature.ImplicitArgs": {
-                "full_name": "openzeppelin.account.library.Account.is_valid_signature.ImplicitArgs",
-                "members": {
-                    "ecdsa_ptr": {
-                        "cairo_type": "starkware.cairo.common.cairo_builtins.SignatureBuiltin*",
-                        "offset": 3
-                    },
-                    "pedersen_ptr": {
-                        "cairo_type": "starkware.cairo.common.cairo_builtins.HashBuiltin*",
-                        "offset": 1
-                    },
-                    "range_check_ptr": {
-                        "cairo_type": "felt",
-                        "offset": 2
-                    },
-                    "syscall_ptr": {
-                        "cairo_type": "felt*",
-                        "offset": 0
-                    }
-                },
-                "size": 4,
-                "type": "struct"
-            },
-            "openzeppelin.account.library.Account.is_valid_signature.Return": {
-                "cairo_type": "(is_valid: felt)",
-                "type": "type_definition"
-            },
-            "openzeppelin.account.library.Account.is_valid_signature.SIZEOF_LOCALS": {
-                "type": "const",
-                "value": 0
-            },
-            "openzeppelin.account.library.Account.set_public_key": {
-                "decorators": [],
-                "pc": 265,
-                "type": "function"
-            },
-            "openzeppelin.account.library.Account.set_public_key.Args": {
-                "full_name": "openzeppelin.account.library.Account.set_public_key.Args",
-                "members": {
-                    "new_public_key": {
-                        "cairo_type": "felt",
-                        "offset": 0
-                    }
-                },
-                "size": 1,
-                "type": "struct"
-            },
-            "openzeppelin.account.library.Account.set_public_key.ImplicitArgs": {
-                "full_name": "openzeppelin.account.library.Account.set_public_key.ImplicitArgs",
+                "full_name": "openzeppelin.account.library.Account.assert_only_self.ImplicitArgs",
                 "members": {
-                    "pedersen_ptr": {
-                        "cairo_type": "starkware.cairo.common.cairo_builtins.HashBuiltin*",
-                        "offset": 1
-                    },
-                    "range_check_ptr": {
-                        "cairo_type": "felt",
-                        "offset": 2
-                    },
                     "syscall_ptr": {
                         "cairo_type": "felt*",
                         "offset": 0
                     }
                 },
-                "size": 3,
+                "size": 1,
                 "type": "struct"
             },
-            "openzeppelin.account.library.Account.set_public_key.Return": {
+            "openzeppelin.account.library.Account.assert_only_self.Return": {
                 "cairo_type": "()",
                 "type": "type_definition"
             },
-            "openzeppelin.account.library.Account.set_public_key.SIZEOF_LOCALS": {
+            "openzeppelin.account.library.Account.assert_only_self.SIZEOF_LOCALS": {
                 "type": "const",
                 "value": 0
             },
-            "openzeppelin.account.library.AccountCallArray": {
-                "full_name": "openzeppelin.account.library.AccountCallArray",
+            "openzeppelin.account.library.Account.execute": {
+                "decorators": [],
+                "pc": 254,
+                "type": "function"
+            },
+            "openzeppelin.account.library.Account.execute.Args": {
+                "full_name": "openzeppelin.account.library.Account.execute.Args",
                 "members": {
-                    "data_len": {
-                        "cairo_type": "felt",
-                        "offset": 3
+                    "call_array": {
+                        "cairo_type": "openzeppelin.account.library.AccountCallArray*",
+                        "offset": 1
                     },
-                    "data_offset": {
+                    "call_array_len": {
                         "cairo_type": "felt",
-                        "offset": 2
+                        "offset": 0
                     },
-                    "selector": {
-                        "cairo_type": "felt",
-                        "offset": 1
+                    "calldata": {
+                        "cairo_type": "felt*",
+                        "offset": 3
                     },
-                    "to": {
+                    "calldata_len": {
                         "cairo_type": "felt",
-                        "offset": 0
+                        "offset": 2
                     }
                 },
                 "size": 4,
                 "type": "struct"
             },
-            "openzeppelin.account.library.Account_public_key": {
-                "type": "namespace"
-            },
-            "openzeppelin.account.library.Account_public_key.Args": {
-                "full_name": "openzeppelin.account.library.Account_public_key.Args",
-                "members": {},
-                "size": 0,
-                "type": "struct"
-            },
-            "openzeppelin.account.library.Account_public_key.HashBuiltin": {
-                "destination": "starkware.cairo.common.cairo_builtins.HashBuiltin",
-                "type": "alias"
-            },
-            "openzeppelin.account.library.Account_public_key.ImplicitArgs": {
-                "full_name": "openzeppelin.account.library.Account_public_key.ImplicitArgs",
-                "members": {},
-                "size": 0,
-                "type": "struct"
-            },
-            "openzeppelin.account.library.Account_public_key.Return": {
-                "cairo_type": "()",
-                "type": "type_definition"
-            },
-            "openzeppelin.account.library.Account_public_key.SIZEOF_LOCALS": {
-                "type": "const",
-                "value": 0
-            },
-            "openzeppelin.account.library.Account_public_key.addr": {
-                "decorators": [],
-                "pc": 209,
-                "type": "function"
-            },
-            "openzeppelin.account.library.Account_public_key.addr.Args": {
-                "full_name": "openzeppelin.account.library.Account_public_key.addr.Args",
-                "members": {},
-                "size": 0,
-                "type": "struct"
-            },
-            "openzeppelin.account.library.Account_public_key.addr.ImplicitArgs": {
-                "full_name": "openzeppelin.account.library.Account_public_key.addr.ImplicitArgs",
+            "openzeppelin.account.library.Account.execute.ImplicitArgs": {
+                "full_name": "openzeppelin.account.library.Account.execute.ImplicitArgs",
                 "members": {
+                    "bitwise_ptr": {
+                        "cairo_type": "starkware.cairo.common.cairo_builtins.BitwiseBuiltin*",
+                        "offset": 3
+                    },
+                    "ecdsa_ptr": {
+                        "cairo_type": "starkware.cairo.common.cairo_builtins.SignatureBuiltin*",
+                        "offset": 2
+                    },
                     "pedersen_ptr": {
                         "cairo_type": "starkware.cairo.common.cairo_builtins.HashBuiltin*",
-                        "offset": 0
+                        "offset": 1
                     },
                     "range_check_ptr": {
                         "cairo_type": "felt",
-                        "offset": 1
+                        "offset": 4
+                    },
+                    "syscall_ptr": {
+                        "cairo_type": "felt*",
+                        "offset": 0
                     }
                 },
-                "size": 2,
+                "size": 5,
                 "type": "struct"
             },
-            "openzeppelin.account.library.Account_public_key.addr.Return": {
-                "cairo_type": "(res: felt)",
+            "openzeppelin.account.library.Account.execute.Return": {
+                "cairo_type": "(response_len: felt, response: felt*)",
                 "type": "type_definition"
             },
-            "openzeppelin.account.library.Account_public_key.addr.SIZEOF_LOCALS": {
+            "openzeppelin.account.library.Account.execute.SIZEOF_LOCALS": {
                 "type": "const",
-                "value": 0
-            },
-            "openzeppelin.account.library.Account_public_key.hash2": {
-                "destination": "starkware.cairo.common.hash.hash2",
-                "type": "alias"
-            },
-            "openzeppelin.account.library.Account_public_key.normalize_address": {
-                "destination": "starkware.starknet.common.storage.normalize_address",
-                "type": "alias"
+                "value": 3
             },
-            "openzeppelin.account.library.Account_public_key.read": {
+            "openzeppelin.account.library.Account.get_public_key": {
                 "decorators": [],
-                "pc": 214,
+                "pc": 194,
                 "type": "function"
             },
-            "openzeppelin.account.library.Account_public_key.read.Args": {
-                "full_name": "openzeppelin.account.library.Account_public_key.read.Args",
+            "openzeppelin.account.library.Account.get_public_key.Args": {
+                "full_name": "openzeppelin.account.library.Account.get_public_key.Args",
                 "members": {},
                 "size": 0,
                 "type": "struct"
             },
-            "openzeppelin.account.library.Account_public_key.read.ImplicitArgs": {
-                "full_name": "openzeppelin.account.library.Account_public_key.read.ImplicitArgs",
+            "openzeppelin.account.library.Account.get_public_key.ImplicitArgs": {
+                "full_name": "openzeppelin.account.library.Account.get_public_key.ImplicitArgs",
                 "members": {
                     "pedersen_ptr": {
                         "cairo_type": "starkware.cairo.common.cairo_builtins.HashBuiltin*",
@@ -24502,31 +23336,23 @@
                 "size": 3,
                 "type": "struct"
             },
-            "openzeppelin.account.library.Account_public_key.read.Return": {
+            "openzeppelin.account.library.Account.get_public_key.Return": {
                 "cairo_type": "(public_key: felt)",
                 "type": "type_definition"
             },
-            "openzeppelin.account.library.Account_public_key.read.SIZEOF_LOCALS": {
+            "openzeppelin.account.library.Account.get_public_key.SIZEOF_LOCALS": {
                 "type": "const",
                 "value": 0
             },
-            "openzeppelin.account.library.Account_public_key.storage_read": {
-                "destination": "starkware.starknet.common.syscalls.storage_read",
-                "type": "alias"
-            },
-            "openzeppelin.account.library.Account_public_key.storage_write": {
-                "destination": "starkware.starknet.common.syscalls.storage_write",
-                "type": "alias"
-            },
-            "openzeppelin.account.library.Account_public_key.write": {
+            "openzeppelin.account.library.Account.initializer": {
                 "decorators": [],
-                "pc": 227,
+                "pc": 178,
                 "type": "function"
             },
-            "openzeppelin.account.library.Account_public_key.write.Args": {
-                "full_name": "openzeppelin.account.library.Account_public_key.write.Args",
+            "openzeppelin.account.library.Account.initializer.Args": {
+                "full_name": "openzeppelin.account.library.Account.initializer.Args",
                 "members": {
-                    "value": {
+                    "_public_key": {
                         "cairo_type": "felt",
                         "offset": 0
                     }
@@ -24534,8 +23360,8 @@
                 "size": 1,
                 "type": "struct"
             },
-            "openzeppelin.account.library.Account_public_key.write.ImplicitArgs": {
-                "full_name": "openzeppelin.account.library.Account_public_key.write.ImplicitArgs",
+            "openzeppelin.account.library.Account.initializer.ImplicitArgs": {
+                "full_name": "openzeppelin.account.library.Account.initializer.ImplicitArgs",
                 "members": {
                     "pedersen_ptr": {
                         "cairo_type": "starkware.cairo.common.cairo_builtins.HashBuiltin*",
@@ -24553,137 +23379,78 @@
                 "size": 3,
                 "type": "struct"
             },
-            "openzeppelin.account.library.Account_public_key.write.Return": {
+            "openzeppelin.account.library.Account.initializer.Return": {
                 "cairo_type": "()",
                 "type": "type_definition"
             },
-            "openzeppelin.account.library.Account_public_key.write.SIZEOF_LOCALS": {
+            "openzeppelin.account.library.Account.initializer.SIZEOF_LOCALS": {
                 "type": "const",
                 "value": 0
             },
-            "openzeppelin.account.library.BitwiseBuiltin": {
-                "destination": "starkware.cairo.common.cairo_builtins.BitwiseBuiltin",
-                "type": "alias"
+            "openzeppelin.account.library.Account.is_valid_signature": {
+                "decorators": [],
+                "pc": 235,
+                "type": "function"
             },
-            "openzeppelin.account.library.Call": {
-                "full_name": "openzeppelin.account.library.Call",
+            "openzeppelin.account.library.Account.is_valid_signature.Args": {
+                "full_name": "openzeppelin.account.library.Account.is_valid_signature.Args",
                 "members": {
-                    "calldata": {
-                        "cairo_type": "felt*",
-                        "offset": 3
-                    },
-                    "calldata_len": {
-                        "cairo_type": "felt",
-                        "offset": 2
-                    },
-                    "selector": {
-                        "cairo_type": "felt",
-                        "offset": 1
-                    },
-                    "to": {
+                    "hash": {
                         "cairo_type": "felt",
                         "offset": 0
-                    }
-                },
-                "size": 4,
-                "type": "struct"
-            },
-            "openzeppelin.account.library.ERC165": {
-                "destination": "openzeppelin.introspection.erc165.library.ERC165",
-                "type": "alias"
-            },
-            "openzeppelin.account.library.HashBuiltin": {
-                "destination": "starkware.cairo.common.cairo_builtins.HashBuiltin",
-                "type": "alias"
-            },
-            "openzeppelin.account.library.IACCOUNT_ID": {
-                "destination": "openzeppelin.utils.constants.library.IACCOUNT_ID",
-                "type": "alias"
-            },
-            "openzeppelin.account.library.SignatureBuiltin": {
-                "destination": "starkware.cairo.common.cairo_builtins.SignatureBuiltin",
-                "type": "alias"
-            },
-            "openzeppelin.account.library.TRUE": {
-                "destination": "starkware.cairo.common.bool.TRUE",
-                "type": "alias"
-            },
-            "openzeppelin.account.library.Uint256": {
-                "destination": "starkware.cairo.common.uint256.Uint256",
-                "type": "alias"
-            },
-            "openzeppelin.account.library.alloc": {
-                "destination": "starkware.cairo.common.alloc.alloc",
-                "type": "alias"
-            },
-            "openzeppelin.account.library.call_contract": {
-                "destination": "starkware.starknet.common.syscalls.call_contract",
-                "type": "alias"
-            },
-            "openzeppelin.account.library.get_caller_address": {
-                "destination": "starkware.starknet.common.syscalls.get_caller_address",
-                "type": "alias"
-            },
-            "openzeppelin.account.library.get_contract_address": {
-                "destination": "starkware.starknet.common.syscalls.get_contract_address",
-                "type": "alias"
-            },
-            "openzeppelin.account.library.get_fp_and_pc": {
-                "destination": "starkware.cairo.common.registers.get_fp_and_pc",
-                "type": "alias"
-            },
-            "openzeppelin.account.library.get_tx_info": {
-                "destination": "starkware.starknet.common.syscalls.get_tx_info",
-                "type": "alias"
-            },
-            "openzeppelin.account.library.memcpy": {
-                "destination": "starkware.cairo.common.memcpy.memcpy",
-                "type": "alias"
-            },
-            "openzeppelin.account.library.split_felt": {
-                "destination": "starkware.cairo.common.math.split_felt",
-                "type": "alias"
-            },
-            "openzeppelin.account.library.verify_ecdsa_signature": {
-                "destination": "starkware.cairo.common.signature.verify_ecdsa_signature",
-                "type": "alias"
-            },
-            "openzeppelin.account.library.verify_eth_signature_uint256": {
-                "destination": "starkware.cairo.common.cairo_secp.signature.verify_eth_signature_uint256",
-                "type": "alias"
-            },
-            "openzeppelin.introspection.erc165.library.ERC165": {
-                "type": "namespace"
-            },
-            "openzeppelin.introspection.erc165.library.ERC165.Args": {
-                "full_name": "openzeppelin.introspection.erc165.library.ERC165.Args",
-                "members": {},
-                "size": 0,
+                    },
+                    "signature": {
+                        "cairo_type": "felt*",
+                        "offset": 2
+                    },
+                    "signature_len": {
+                        "cairo_type": "felt",
+                        "offset": 1
+                    }
+                },
+                "size": 3,
                 "type": "struct"
             },
-            "openzeppelin.introspection.erc165.library.ERC165.ImplicitArgs": {
-                "full_name": "openzeppelin.introspection.erc165.library.ERC165.ImplicitArgs",
-                "members": {},
-                "size": 0,
+            "openzeppelin.account.library.Account.is_valid_signature.ImplicitArgs": {
+                "full_name": "openzeppelin.account.library.Account.is_valid_signature.ImplicitArgs",
+                "members": {
+                    "ecdsa_ptr": {
+                        "cairo_type": "starkware.cairo.common.cairo_builtins.SignatureBuiltin*",
+                        "offset": 2
+                    },
+                    "pedersen_ptr": {
+                        "cairo_type": "starkware.cairo.common.cairo_builtins.HashBuiltin*",
+                        "offset": 1
+                    },
+                    "range_check_ptr": {
+                        "cairo_type": "felt",
+                        "offset": 3
+                    },
+                    "syscall_ptr": {
+                        "cairo_type": "felt*",
+                        "offset": 0
+                    }
+                },
+                "size": 4,
                 "type": "struct"
             },
-            "openzeppelin.introspection.erc165.library.ERC165.Return": {
-                "cairo_type": "()",
+            "openzeppelin.account.library.Account.is_valid_signature.Return": {
+                "cairo_type": "(is_valid: felt)",
                 "type": "type_definition"
             },
-            "openzeppelin.introspection.erc165.library.ERC165.SIZEOF_LOCALS": {
+            "openzeppelin.account.library.Account.is_valid_signature.SIZEOF_LOCALS": {
                 "type": "const",
                 "value": 0
             },
-            "openzeppelin.introspection.erc165.library.ERC165.register_interface": {
+            "openzeppelin.account.library.Account.set_public_key": {
                 "decorators": [],
-                "pc": 195,
+                "pc": 226,
                 "type": "function"
             },
-            "openzeppelin.introspection.erc165.library.ERC165.register_interface.Args": {
-                "full_name": "openzeppelin.introspection.erc165.library.ERC165.register_interface.Args",
+            "openzeppelin.account.library.Account.set_public_key.Args": {
+                "full_name": "openzeppelin.account.library.Account.set_public_key.Args",
                 "members": {
-                    "interface_id": {
+                    "new_public_key": {
                         "cairo_type": "felt",
                         "offset": 0
                     }
@@ -24691,8 +23458,8 @@
                 "size": 1,
                 "type": "struct"
             },
-            "openzeppelin.introspection.erc165.library.ERC165.register_interface.ImplicitArgs": {
-                "full_name": "openzeppelin.introspection.erc165.library.ERC165.register_interface.ImplicitArgs",
+            "openzeppelin.account.library.Account.set_public_key.ImplicitArgs": {
+                "full_name": "openzeppelin.account.library.Account.set_public_key.ImplicitArgs",
                 "members": {
                     "pedersen_ptr": {
                         "cairo_type": "starkware.cairo.common.cairo_builtins.HashBuiltin*",
@@ -24710,21 +23477,21 @@
                 "size": 3,
                 "type": "struct"
             },
-            "openzeppelin.introspection.erc165.library.ERC165.register_interface.Return": {
+            "openzeppelin.account.library.Account.set_public_key.Return": {
                 "cairo_type": "()",
                 "type": "type_definition"
             },
-            "openzeppelin.introspection.erc165.library.ERC165.register_interface.SIZEOF_LOCALS": {
+            "openzeppelin.account.library.Account.set_public_key.SIZEOF_LOCALS": {
                 "type": "const",
                 "value": 0
             },
-            "openzeppelin.introspection.erc165.library.ERC165.supports_interface": {
+            "openzeppelin.account.library.Account.supports_interface": {
                 "decorators": [],
-                "pc": 178,
+                "pc": 200,
                 "type": "function"
             },
-            "openzeppelin.introspection.erc165.library.ERC165.supports_interface.Args": {
-                "full_name": "openzeppelin.introspection.erc165.library.ERC165.supports_interface.Args",
+            "openzeppelin.account.library.Account.supports_interface.Args": {
+                "full_name": "openzeppelin.account.library.Account.supports_interface.Args",
                 "members": {
                     "interface_id": {
                         "cairo_type": "felt",
@@ -24734,8 +23501,8 @@
                 "size": 1,
                 "type": "struct"
             },
-            "openzeppelin.introspection.erc165.library.ERC165.supports_interface.ImplicitArgs": {
-                "full_name": "openzeppelin.introspection.erc165.library.ERC165.supports_interface.ImplicitArgs",
+            "openzeppelin.account.library.Account.supports_interface.ImplicitArgs": {
+                "full_name": "openzeppelin.account.library.Account.supports_interface.ImplicitArgs",
                 "members": {
                     "pedersen_ptr": {
                         "cairo_type": "starkware.cairo.common.cairo_builtins.HashBuiltin*",
@@ -24753,59 +23520,77 @@
                 "size": 3,
                 "type": "struct"
             },
-            "openzeppelin.introspection.erc165.library.ERC165.supports_interface.Return": {
+            "openzeppelin.account.library.Account.supports_interface.Return": {
                 "cairo_type": "(success: felt)",
                 "type": "type_definition"
             },
-            "openzeppelin.introspection.erc165.library.ERC165.supports_interface.SIZEOF_LOCALS": {
+            "openzeppelin.account.library.Account.supports_interface.SIZEOF_LOCALS": {
                 "type": "const",
                 "value": 0
             },
-            "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces": {
+            "openzeppelin.account.library.AccountCallArray": {
+                "full_name": "openzeppelin.account.library.AccountCallArray",
+                "members": {
+                    "data_len": {
+                        "cairo_type": "felt",
+                        "offset": 3
+                    },
+                    "data_offset": {
+                        "cairo_type": "felt",
+                        "offset": 2
+                    },
+                    "selector": {
+                        "cairo_type": "felt",
+                        "offset": 1
+                    },
+                    "to": {
+                        "cairo_type": "felt",
+                        "offset": 0
+                    }
+                },
+                "size": 4,
+                "type": "struct"
+            },
+            "openzeppelin.account.library.Account_public_key": {
                 "type": "namespace"
             },
-            "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.Args": {
-                "full_name": "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.Args",
+            "openzeppelin.account.library.Account_public_key.Args": {
+                "full_name": "openzeppelin.account.library.Account_public_key.Args",
                 "members": {},
                 "size": 0,
                 "type": "struct"
             },
-            "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.HashBuiltin": {
+            "openzeppelin.account.library.Account_public_key.HashBuiltin": {
                 "destination": "starkware.cairo.common.cairo_builtins.HashBuiltin",
                 "type": "alias"
             },
-            "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.ImplicitArgs": {
-                "full_name": "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.ImplicitArgs",
+            "openzeppelin.account.library.Account_public_key.ImplicitArgs": {
+                "full_name": "openzeppelin.account.library.Account_public_key.ImplicitArgs",
                 "members": {},
                 "size": 0,
                 "type": "struct"
             },
-            "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.Return": {
+            "openzeppelin.account.library.Account_public_key.Return": {
                 "cairo_type": "()",
                 "type": "type_definition"
             },
-            "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.SIZEOF_LOCALS": {
+            "openzeppelin.account.library.Account_public_key.SIZEOF_LOCALS": {
                 "type": "const",
                 "value": 0
             },
-            "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.addr": {
+            "openzeppelin.account.library.Account_public_key.addr": {
                 "decorators": [],
-                "pc": 137,
+                "pc": 148,
                 "type": "function"
             },
-            "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.addr.Args": {
-                "full_name": "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.addr.Args",
-                "members": {
-                    "interface_id": {
-                        "cairo_type": "felt",
-                        "offset": 0
-                    }
-                },
-                "size": 1,
+            "openzeppelin.account.library.Account_public_key.addr.Args": {
+                "full_name": "openzeppelin.account.library.Account_public_key.addr.Args",
+                "members": {},
+                "size": 0,
                 "type": "struct"
             },
-            "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.addr.ImplicitArgs": {
-                "full_name": "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.addr.ImplicitArgs",
+            "openzeppelin.account.library.Account_public_key.addr.ImplicitArgs": {
+                "full_name": "openzeppelin.account.library.Account_public_key.addr.ImplicitArgs",
                 "members": {
                     "pedersen_ptr": {
                         "cairo_type": "starkware.cairo.common.cairo_builtins.HashBuiltin*",
@@ -24819,40 +23604,35 @@
                 "size": 2,
                 "type": "struct"
             },
-            "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.addr.Return": {
+            "openzeppelin.account.library.Account_public_key.addr.Return": {
                 "cairo_type": "(res: felt)",
                 "type": "type_definition"
             },
-            "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.addr.SIZEOF_LOCALS": {
+            "openzeppelin.account.library.Account_public_key.addr.SIZEOF_LOCALS": {
                 "type": "const",
                 "value": 0
             },
-            "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.hash2": {
+            "openzeppelin.account.library.Account_public_key.hash2": {
                 "destination": "starkware.cairo.common.hash.hash2",
                 "type": "alias"
             },
-            "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.normalize_address": {
+            "openzeppelin.account.library.Account_public_key.normalize_address": {
                 "destination": "starkware.starknet.common.storage.normalize_address",
                 "type": "alias"
             },
-            "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.read": {
+            "openzeppelin.account.library.Account_public_key.read": {
                 "decorators": [],
-                "pc": 151,
+                "pc": 153,
                 "type": "function"
             },
-            "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.read.Args": {
-                "full_name": "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.read.Args",
-                "members": {
-                    "interface_id": {
-                        "cairo_type": "felt",
-                        "offset": 0
-                    }
-                },
-                "size": 1,
+            "openzeppelin.account.library.Account_public_key.read.Args": {
+                "full_name": "openzeppelin.account.library.Account_public_key.read.Args",
+                "members": {},
+                "size": 0,
                 "type": "struct"
             },
-            "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.read.ImplicitArgs": {
-                "full_name": "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.read.ImplicitArgs",
+            "openzeppelin.account.library.Account_public_key.read.ImplicitArgs": {
+                "full_name": "openzeppelin.account.library.Account_public_key.read.ImplicitArgs",
                 "members": {
                     "pedersen_ptr": {
                         "cairo_type": "starkware.cairo.common.cairo_builtins.HashBuiltin*",
@@ -24870,44 +23650,40 @@
                 "size": 3,
                 "type": "struct"
             },
-            "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.read.Return": {
-                "cairo_type": "(is_supported: felt)",
+            "openzeppelin.account.library.Account_public_key.read.Return": {
+                "cairo_type": "(public_key: felt)",
                 "type": "type_definition"
             },
-            "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.read.SIZEOF_LOCALS": {
+            "openzeppelin.account.library.Account_public_key.read.SIZEOF_LOCALS": {
                 "type": "const",
                 "value": 0
             },
-            "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.storage_read": {
+            "openzeppelin.account.library.Account_public_key.storage_read": {
                 "destination": "starkware.starknet.common.syscalls.storage_read",
                 "type": "alias"
             },
-            "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.storage_write": {
+            "openzeppelin.account.library.Account_public_key.storage_write": {
                 "destination": "starkware.starknet.common.syscalls.storage_write",
                 "type": "alias"
             },
-            "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.write": {
+            "openzeppelin.account.library.Account_public_key.write": {
                 "decorators": [],
-                "pc": 165,
+                "pc": 166,
                 "type": "function"
             },
-            "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.write.Args": {
-                "full_name": "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.write.Args",
+            "openzeppelin.account.library.Account_public_key.write.Args": {
+                "full_name": "openzeppelin.account.library.Account_public_key.write.Args",
                 "members": {
-                    "interface_id": {
-                        "cairo_type": "felt",
-                        "offset": 0
-                    },
                     "value": {
                         "cairo_type": "felt",
-                        "offset": 1
+                        "offset": 0
                     }
                 },
-                "size": 2,
+                "size": 1,
                 "type": "struct"
             },
-            "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.write.ImplicitArgs": {
-                "full_name": "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.write.ImplicitArgs",
+            "openzeppelin.account.library.Account_public_key.write.ImplicitArgs": {
+                "full_name": "openzeppelin.account.library.Account_public_key.write.ImplicitArgs",
                 "members": {
                     "pedersen_ptr": {
                         "cairo_type": "starkware.cairo.common.cairo_builtins.HashBuiltin*",
@@ -24925,32 +23701,115 @@
                 "size": 3,
                 "type": "struct"
             },
-            "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.write.Return": {
+            "openzeppelin.account.library.Account_public_key.write.Return": {
                 "cairo_type": "()",
                 "type": "type_definition"
             },
-            "openzeppelin.introspection.erc165.library.ERC165_supported_interfaces.write.SIZEOF_LOCALS": {
+            "openzeppelin.account.library.Account_public_key.write.SIZEOF_LOCALS": {
                 "type": "const",
                 "value": 0
             },
-            "openzeppelin.introspection.erc165.library.HashBuiltin": {
+            "openzeppelin.account.library.BitwiseBuiltin": {
+                "destination": "starkware.cairo.common.cairo_builtins.BitwiseBuiltin",
+                "type": "alias"
+            },
+            "openzeppelin.account.library.Call": {
+                "full_name": "openzeppelin.account.library.Call",
+                "members": {
+                    "calldata": {
+                        "cairo_type": "felt*",
+                        "offset": 3
+                    },
+                    "calldata_len": {
+                        "cairo_type": "felt",
+                        "offset": 2
+                    },
+                    "selector": {
+                        "cairo_type": "felt",
+                        "offset": 1
+                    },
+                    "to": {
+                        "cairo_type": "felt",
+                        "offset": 0
+                    }
+                },
+                "size": 4,
+                "type": "struct"
+            },
+            "openzeppelin.account.library.FALSE": {
+                "destination": "starkware.cairo.common.bool.FALSE",
+                "type": "alias"
+            },
+            "openzeppelin.account.library.HashBuiltin": {
                 "destination": "starkware.cairo.common.cairo_builtins.HashBuiltin",
                 "type": "alias"
             },
-            "openzeppelin.introspection.erc165.library.IERC165_ID": {
+            "openzeppelin.account.library.IACCOUNT_ID": {
+                "destination": "openzeppelin.utils.constants.library.IACCOUNT_ID",
+                "type": "alias"
+            },
+            "openzeppelin.account.library.IERC165_ID": {
                 "destination": "openzeppelin.utils.constants.library.IERC165_ID",
                 "type": "alias"
             },
-            "openzeppelin.introspection.erc165.library.INVALID_ID": {
-                "destination": "openzeppelin.utils.constants.library.INVALID_ID",
+            "openzeppelin.account.library.SignatureBuiltin": {
+                "destination": "starkware.cairo.common.cairo_builtins.SignatureBuiltin",
+                "type": "alias"
+            },
+            "openzeppelin.account.library.TRANSACTION_VERSION": {
+                "destination": "openzeppelin.utils.constants.library.TRANSACTION_VERSION",
                 "type": "alias"
             },
-            "openzeppelin.introspection.erc165.library.TRUE": {
+            "openzeppelin.account.library.TRUE": {
                 "destination": "starkware.cairo.common.bool.TRUE",
                 "type": "alias"
             },
-            "openzeppelin.introspection.erc165.library.assert_not_equal": {
-                "destination": "starkware.cairo.common.math.assert_not_equal",
+            "openzeppelin.account.library.Uint256": {
+                "destination": "starkware.cairo.common.uint256.Uint256",
+                "type": "alias"
+            },
+            "openzeppelin.account.library.alloc": {
+                "destination": "starkware.cairo.common.alloc.alloc",
+                "type": "alias"
+            },
+            "openzeppelin.account.library.call_contract": {
+                "destination": "starkware.starknet.common.syscalls.call_contract",
+                "type": "alias"
+            },
+            "openzeppelin.account.library.get_caller_address": {
+                "destination": "starkware.starknet.common.syscalls.get_caller_address",
+                "type": "alias"
+            },
+            "openzeppelin.account.library.get_contract_address": {
+                "destination": "starkware.starknet.common.syscalls.get_contract_address",
+                "type": "alias"
+            },
+            "openzeppelin.account.library.get_fp_and_pc": {
+                "destination": "starkware.cairo.common.registers.get_fp_and_pc",
+                "type": "alias"
+            },
+            "openzeppelin.account.library.get_tx_info": {
+                "destination": "starkware.starknet.common.syscalls.get_tx_info",
+                "type": "alias"
+            },
+            "openzeppelin.account.library.is_le_felt": {
+                "destination": "starkware.cairo.common.math_cmp.is_le_felt",
+                "type": "alias"
+            },
+            "openzeppelin.account.library.memcpy": {
+                "destination": "starkware.cairo.common.memcpy.memcpy",
+                "type": "alias"
+            },
+            "openzeppelin.account.library.split_felt": {
+                "destination": "starkware.cairo.common.math.split_felt",
+                "type": "alias"
+            },
+            "openzeppelin.account.library.verify_ecdsa_signature": {
+                "destination": "starkware.cairo.common.signature.verify_ecdsa_signature",
+                "type": "alias"
+            },
+            "openzeppelin.account.library.verify_eth_signature_uint256": {
+                "destination": "starkware.cairo.common.cairo_secp.signature.verify_eth_signature_uint256",
                 "type": "alias"
             },
             "openzeppelin.utils.constants.library.DEFAULT_ADMIN_ROLE": {
@@ -24963,7 +23822,7 @@
             },
             "openzeppelin.utils.constants.library.IACCOUNT_ID": {
                 "type": "const",
-                "value": 4044209476
+                "value": 2792084853
             },
             "openzeppelin.utils.constants.library.IERC165_ID": {
                 "type": "const",
@@ -24989,9 +23848,13 @@
                 "type": "const",
                 "value": 4294967295
             },
+            "openzeppelin.utils.constants.library.TRANSACTION_VERSION": {
+                "type": "const",
+                "value": 1
+            },
             "openzeppelin.utils.constants.library.UINT8_MAX": {
                 "type": "const",
-                "value": 256
+                "value": 255
             },
             "starkware.cairo.common.alloc.alloc": {
                 "decorators": [],
@@ -25674,45 +24537,6 @@
                 "destination": "starkware.cairo.common.cairo_builtins.HashBuiltin",
                 "type": "alias"
             },
-            "starkware.cairo.common.hash.hash2": {
-                "decorators": [],
-                "pc": 3,
-                "type": "function"
-            },
-            "starkware.cairo.common.hash.hash2.Args": {
-                "full_name": "starkware.cairo.common.hash.hash2.Args",
-                "members": {
-                    "x": {
-                        "cairo_type": "felt",
-                        "offset": 0
-                    },
-                    "y": {
-                        "cairo_type": "felt",
-                        "offset": 1
-                    }
-                },
-                "size": 2,
-                "type": "struct"
-            },
-            "starkware.cairo.common.hash.hash2.ImplicitArgs": {
-                "full_name": "starkware.cairo.common.hash.hash2.ImplicitArgs",
-                "members": {
-                    "hash_ptr": {
-                        "cairo_type": "starkware.cairo.common.cairo_builtins.HashBuiltin*",
-                        "offset": 0
-                    }
-                },
-                "size": 1,
-                "type": "struct"
-            },
-            "starkware.cairo.common.hash.hash2.Return": {
-                "cairo_type": "(result: felt)",
-                "type": "type_definition"
-            },
-            "starkware.cairo.common.hash.hash2.SIZEOF_LOCALS": {
-                "type": "const",
-                "value": 0
-            },
             "starkware.cairo.common.keccak_state.KeccakBuiltinState": {
                 "full_name": "starkware.cairo.common.keccak_state.KeccakBuiltinState",
                 "members": {
@@ -25760,30 +24584,30 @@
                 "destination": "starkware.cairo.common.bool.TRUE",
                 "type": "alias"
             },
-            "starkware.cairo.common.math.assert_250_bit": {
+            "starkware.cairo.common.math.assert_le_felt": {
                 "decorators": [
                     "known_ap_change"
                 ],
-                "pc": 30,
+                "pc": 18,
                 "type": "function"
             },
-            "starkware.cairo.common.math.assert_250_bit.Args": {
-                "full_name": "starkware.cairo.common.math.assert_250_bit.Args",
+            "starkware.cairo.common.math.assert_le_felt.Args": {
+                "full_name": "starkware.cairo.common.math.assert_le_felt.Args",
                 "members": {
-                    "value": {
+                    "a": {
                         "cairo_type": "felt",
                         "offset": 0
+                    },
+                    "b": {
+                        "cairo_type": "felt",
+                        "offset": 1
                     }
                 },
-                "size": 1,
-                "type": "struct"
-            },
-            "starkware.cairo.common.math.assert_250_bit.HIGH_BOUND": {
-                "type": "const",
-                "value": 5316911983139663491615228241121378304
+                "size": 2,
+                "type": "struct"
             },
-            "starkware.cairo.common.math.assert_250_bit.ImplicitArgs": {
-                "full_name": "starkware.cairo.common.math.assert_250_bit.ImplicitArgs",
+            "starkware.cairo.common.math.assert_le_felt.ImplicitArgs": {
+                "full_name": "starkware.cairo.common.math.assert_le_felt.ImplicitArgs",
                 "members": {
                     "range_check_ptr": {
                         "cairo_type": "felt",
@@ -25793,74 +24617,92 @@
                 "size": 1,
                 "type": "struct"
             },
-            "starkware.cairo.common.math.assert_250_bit.Return": {
-                "cairo_type": "()",
-                "type": "type_definition"
-            },
-            "starkware.cairo.common.math.assert_250_bit.SHIFT": {
+            "starkware.cairo.common.math.assert_le_felt.PRIME_OVER_2_HIGH": {
                 "type": "const",
-                "value": 340282366920938463463374607431768211456
+                "value": 5316911983139663648412552867652567041
             },
-            "starkware.cairo.common.math.assert_250_bit.SIZEOF_LOCALS": {
+            "starkware.cairo.common.math.assert_le_felt.PRIME_OVER_3_HIGH": {
                 "type": "const",
-                "value": 0
+                "value": 3544607988759775765608368578435044694
+            },
+            "starkware.cairo.common.math.assert_le_felt.Return": {
+                "cairo_type": "()",
+                "type": "type_definition"
             },
-            "starkware.cairo.common.math.assert_250_bit.UPPER_BOUND": {
+            "starkware.cairo.common.math.assert_le_felt.SIZEOF_LOCALS": {
                 "type": "const",
-                "value": 1809251394333065553493296640760748560207343510400633813116524750123642650624
+                "value": 0
             },
-            "starkware.cairo.common.math.assert_250_bit.high": {
+            "starkware.cairo.common.math.assert_le_felt.a": {
                 "cairo_type": "felt",
-                "full_name": "starkware.cairo.common.math.assert_250_bit.high",
+                "full_name": "starkware.cairo.common.math.assert_le_felt.a",
                 "references": [
                     {
                         "ap_tracking_data": {
-                            "group": 4,
+                            "group": 2,
                             "offset": 0
                         },
-                        "pc": 30,
-                        "value": "[cast([fp + (-4)] + 1, felt*)]"
+                        "pc": 18,
+                        "value": "[cast(fp + (-4), felt*)]"
                     }
                 ],
                 "type": "reference"
             },
-            "starkware.cairo.common.math.assert_250_bit.low": {
+            "starkware.cairo.common.math.assert_le_felt.b": {
                 "cairo_type": "felt",
-                "full_name": "starkware.cairo.common.math.assert_250_bit.low",
+                "full_name": "starkware.cairo.common.math.assert_le_felt.b",
                 "references": [
                     {
                         "ap_tracking_data": {
-                            "group": 4,
+                            "group": 2,
                             "offset": 0
                         },
-                        "pc": 30,
-                        "value": "[cast([fp + (-4)], felt*)]"
+                        "pc": 18,
+                        "value": "[cast(fp + (-3), felt*)]"
                     }
                 ],
                 "type": "reference"
             },
-            "starkware.cairo.common.math.assert_250_bit.value": {
+            "starkware.cairo.common.math.assert_le_felt.range_check_ptr": {
                 "cairo_type": "felt",
-                "full_name": "starkware.cairo.common.math.assert_250_bit.value",
+                "full_name": "starkware.cairo.common.math.assert_le_felt.range_check_ptr",
                 "references": [
                     {
                         "ap_tracking_data": {
-                            "group": 4,
+                            "group": 2,
                             "offset": 0
                         },
-                        "pc": 30,
-                        "value": "[cast(fp + (-3), felt*)]"
+                        "pc": 18,
+                        "value": "[cast(fp + (-5), felt*)]"
+                    },
+                    {
+                        "ap_tracking_data": {
+                            "group": 2,
+                            "offset": 8
+                        },
+                        "pc": 28,
+                        "value": "cast([fp + (-5)] + 4, felt)"
                     }
                 ],
                 "type": "reference"
             },
-            "starkware.cairo.common.math.assert_not_equal": {
-                "decorators": [],
-                "pc": 24,
+            "starkware.cairo.common.math.assert_le_felt.skip_exclude_a": {
+                "pc": 42,
+                "type": "label"
+            },
+            "starkware.cairo.common.math.assert_le_felt.skip_exclude_b_minus_a": {
+                "pc": 54,
+                "type": "label"
+            },
+            "starkware.cairo.common.math.assert_lt_felt": {
+                "decorators": [
+                    "known_ap_change"
+                ],
+                "pc": 63,
                 "type": "function"
             },
-            "starkware.cairo.common.math.assert_not_equal.Args": {
-                "full_name": "starkware.cairo.common.math.assert_not_equal.Args",
+            "starkware.cairo.common.math.assert_lt_felt.Args": {
+                "full_name": "starkware.cairo.common.math.assert_lt_felt.Args",
                 "members": {
                     "a": {
                         "cairo_type": "felt",
@@ -25874,45 +24716,50 @@
                 "size": 2,
                 "type": "struct"
             },
-            "starkware.cairo.common.math.assert_not_equal.ImplicitArgs": {
-                "full_name": "starkware.cairo.common.math.assert_not_equal.ImplicitArgs",
-                "members": {},
-                "size": 0,
+            "starkware.cairo.common.math.assert_lt_felt.ImplicitArgs": {
+                "full_name": "starkware.cairo.common.math.assert_lt_felt.ImplicitArgs",
+                "members": {
+                    "range_check_ptr": {
+                        "cairo_type": "felt",
+                        "offset": 0
+                    }
+                },
+                "size": 1,
                 "type": "struct"
             },
-            "starkware.cairo.common.math.assert_not_equal.Return": {
+            "starkware.cairo.common.math.assert_lt_felt.Return": {
                 "cairo_type": "()",
                 "type": "type_definition"
             },
-            "starkware.cairo.common.math.assert_not_equal.SIZEOF_LOCALS": {
+            "starkware.cairo.common.math.assert_lt_felt.SIZEOF_LOCALS": {
                 "type": "const",
                 "value": 0
             },
-            "starkware.cairo.common.math.assert_not_equal.a": {
+            "starkware.cairo.common.math.assert_lt_felt.a": {
                 "cairo_type": "felt",
-                "full_name": "starkware.cairo.common.math.assert_not_equal.a",
+                "full_name": "starkware.cairo.common.math.assert_lt_felt.a",
                 "references": [
                     {
                         "ap_tracking_data": {
                             "group": 3,
                             "offset": 0
                         },
-                        "pc": 24,
+                        "pc": 63,
                         "value": "[cast(fp + (-4), felt*)]"
                     }
                 ],
                 "type": "reference"
             },
-            "starkware.cairo.common.math.assert_not_equal.b": {
+            "starkware.cairo.common.math.assert_lt_felt.b": {
                 "cairo_type": "felt",
-                "full_name": "starkware.cairo.common.math.assert_not_equal.b",
+                "full_name": "starkware.cairo.common.math.assert_lt_felt.b",
                 "references": [
                     {
                         "ap_tracking_data": {
                             "group": 3,
                             "offset": 0
                         },
-                        "pc": 24,
+                        "pc": 63,
                         "value": "[cast(fp + (-3), felt*)]"
                     }
                 ],
@@ -25930,9 +24777,84 @@
                 "destination": "starkware.cairo.common.math.assert_lt_felt",
                 "type": "alias"
             },
+            "starkware.cairo.common.math_cmp.is_le_felt": {
+                "decorators": [
+                    "known_ap_change"
+                ],
+                "pc": 128,
+                "type": "function"
+            },
+            "starkware.cairo.common.math_cmp.is_le_felt.Args": {
+                "full_name": "starkware.cairo.common.math_cmp.is_le_felt.Args",
+                "members": {
+                    "a": {
+                        "cairo_type": "felt",
+                        "offset": 0
+                    },
+                    "b": {
+                        "cairo_type": "felt",
+                        "offset": 1
+                    }
+                },
+                "size": 2,
+                "type": "struct"
+            },
+            "starkware.cairo.common.math_cmp.is_le_felt.ImplicitArgs": {
+                "full_name": "starkware.cairo.common.math_cmp.is_le_felt.ImplicitArgs",
+                "members": {
+                    "range_check_ptr": {
+                        "cairo_type": "felt",
+                        "offset": 0
+                    }
+                },
+                "size": 1,
+                "type": "struct"
+            },
+            "starkware.cairo.common.math_cmp.is_le_felt.Return": {
+                "cairo_type": "felt",
+                "type": "type_definition"
+            },
+            "starkware.cairo.common.math_cmp.is_le_felt.SIZEOF_LOCALS": {
+                "type": "const",
+                "value": 0
+            },
+            "starkware.cairo.common.math_cmp.is_le_felt.a": {
+                "cairo_type": "felt",
+                "full_name": "starkware.cairo.common.math_cmp.is_le_felt.a",
+                "references": [
+                    {
+                        "ap_tracking_data": {
+                            "group": 11,
+                            "offset": 0
+                        },
+                        "pc": 128,
+                        "value": "[cast(fp + (-4), felt*)]"
+                    }
+                ],
+                "type": "reference"
+            },
+            "starkware.cairo.common.math_cmp.is_le_felt.b": {
+                "cairo_type": "felt",
+                "full_name": "starkware.cairo.common.math_cmp.is_le_felt.b",
+                "references": [
+                    {
+                        "ap_tracking_data": {
+                            "group": 11,
+                            "offset": 0
+                        },
+                        "pc": 128,
+                        "value": "[cast(fp + (-3), felt*)]"
+                    }
+                ],
+                "type": "reference"
+            },
+            "starkware.cairo.common.math_cmp.is_le_felt.not_le": {
+                "pc": 140,
+                "type": "label"
+            },
             "starkware.cairo.common.memcpy.memcpy": {
                 "decorators": [],
-                "pc": 9,
+                "pc": 3,
                 "type": "function"
             },
             "starkware.cairo.common.memcpy.memcpy.Args": {
@@ -25989,10 +24911,10 @@
                 "references": [
                     {
                         "ap_tracking_data": {
-                            "group": 2,
+                            "group": 1,
                             "offset": 3
                         },
-                        "pc": 16,
+                        "pc": 10,
                         "value": "[cast(ap, felt*)]"
                     }
                 ],
@@ -26004,17 +24926,17 @@
                 "references": [
                     {
                         "ap_tracking_data": {
-                            "group": 2,
+                            "group": 1,
                             "offset": 0
                         },
-                        "pc": 9,
+                        "pc": 3,
                         "value": "[cast(fp + (-3), felt*)]"
                     }
                 ],
                 "type": "reference"
             },
             "starkware.cairo.common.memcpy.memcpy.loop": {
-                "pc": 14,
+                "pc": 8,
                 "type": "label"
             },
             "starkware.cairo.common.pow.assert_le": {
@@ -26083,7 +25005,7 @@
             },
             "starkware.cairo.common.signature.verify_ecdsa_signature": {
                 "decorators": [],
-                "pc": 132,
+                "pc": 123,
                 "type": "function"
             },
             "starkware.cairo.common.signature.verify_ecdsa_signature.Args": {
@@ -26134,18 +25056,18 @@
                 "references": [
                     {
                         "ap_tracking_data": {
-                            "group": 12,
+                            "group": 10,
                             "offset": 0
                         },
-                        "pc": 132,
+                        "pc": 123,
                         "value": "[cast(fp + (-7), starkware.cairo.common.cairo_builtins.SignatureBuiltin**)]"
                     },
                     {
                         "ap_tracking_data": {
-                            "group": 12,
+                            "group": 10,
                             "offset": 0
                         },
-                        "pc": 134,
+                        "pc": 125,
                         "value": "cast([fp + (-7)] + 2, starkware.cairo.common.cairo_builtins.SignatureBuiltin*)"
                     }
                 ],
@@ -26157,10 +25079,10 @@
                 "references": [
                     {
                         "ap_tracking_data": {
-                            "group": 12,
+                            "group": 10,
                             "offset": 0
                         },
-                        "pc": 132,
+                        "pc": 123,
                         "value": "[cast(fp + (-4), felt*)]"
                     }
                 ],
@@ -26172,10 +25094,10 @@
                 "references": [
                     {
                         "ap_tracking_data": {
-                            "group": 12,
+                            "group": 10,
                             "offset": 0
                         },
-                        "pc": 132,
+                        "pc": 123,
                         "value": "[cast(fp + (-3), felt*)]"
                     }
                 ],
@@ -26268,88 +25190,6 @@
                 "destination": "starkware.cairo.common.math.assert_250_bit",
                 "type": "alias"
             },
-            "starkware.starknet.common.storage.normalize_address": {
-                "decorators": [
-                    "known_ap_change"
-                ],
-                "pc": 43,
-                "type": "function"
-            },
-            "starkware.starknet.common.storage.normalize_address.Args": {
-                "full_name": "starkware.starknet.common.storage.normalize_address.Args",
-                "members": {
-                    "addr": {
-                        "cairo_type": "felt",
-                        "offset": 0
-                    }
-                },
-                "size": 1,
-                "type": "struct"
-            },
-            "starkware.starknet.common.storage.normalize_address.ImplicitArgs": {
-                "full_name": "starkware.starknet.common.storage.normalize_address.ImplicitArgs",
-                "members": {
-                    "range_check_ptr": {
-                        "cairo_type": "felt",
-                        "offset": 0
-                    }
-                },
-                "size": 1,
-                "type": "struct"
-            },
-            "starkware.starknet.common.storage.normalize_address.Return": {
-                "cairo_type": "(res: felt)",
-                "type": "type_definition"
-            },
-            "starkware.starknet.common.storage.normalize_address.SIZEOF_LOCALS": {
-                "type": "const",
-                "value": 0
-            },
-            "starkware.starknet.common.storage.normalize_address.addr": {
-                "cairo_type": "felt",
-                "full_name": "starkware.starknet.common.storage.normalize_address.addr",
-                "references": [
-                    {
-                        "ap_tracking_data": {
-                            "group": 5,
-                            "offset": 0
-                        },
-                        "pc": 43,
-                        "value": "[cast(fp + (-3), felt*)]"
-                    }
-                ],
-                "type": "reference"
-            },
-            "starkware.starknet.common.storage.normalize_address.is_250": {
-                "cairo_type": "felt",
-                "full_name": "starkware.starknet.common.storage.normalize_address.is_250",
-                "references": [
-                    {
-                        "ap_tracking_data": {
-                            "group": 5,
-                            "offset": 2
-                        },
-                        "pc": 63,
-                        "value": "[cast(ap + (-1), felt*)]"
-                    }
-                ],
-                "type": "reference"
-            },
-            "starkware.starknet.common.storage.normalize_address.is_small": {
-                "cairo_type": "felt",
-                "full_name": "starkware.starknet.common.storage.normalize_address.is_small",
-                "references": [
-                    {
-                        "ap_tracking_data": {
-                            "group": 5,
-                            "offset": 1
-                        },
-                        "pc": 45,
-                        "value": "[cast(ap + (-1), felt*)]"
-                    }
-                ],
-                "type": "reference"
-            },
             "starkware.starknet.common.syscalls.CALL_CONTRACT_SELECTOR": {
                 "type": "const",
                 "value": 20853273475220472486191784820
@@ -27000,7 +25840,7 @@
             },
             "starkware.starknet.common.syscalls.call_contract": {
                 "decorators": [],
-                "pc": 83,
+                "pc": 74,
                 "type": "function"
             },
             "starkware.starknet.common.syscalls.call_contract.Args": {
@@ -27051,18 +25891,18 @@
                 "references": [
                     {
                         "ap_tracking_data": {
-                            "group": 6,
+                            "group": 4,
                             "offset": 0
                         },
-                        "pc": 83,
+                        "pc": 74,
                         "value": "[cast(fp + (-7), felt**)]"
                     },
                     {
                         "ap_tracking_data": {
-                            "group": 6,
+                            "group": 4,
                             "offset": 1
                         },
-                        "pc": 90,
+                        "pc": 81,
                         "value": "cast([fp + (-7)] + 7, felt*)"
                     }
                 ],
@@ -27070,7 +25910,7 @@
             },
             "starkware.starknet.common.syscalls.get_caller_address": {
                 "decorators": [],
-                "pc": 95,
+                "pc": 86,
                 "type": "function"
             },
             "starkware.starknet.common.syscalls.get_caller_address.Args": {
@@ -27104,18 +25944,18 @@
                 "references": [
                     {
                         "ap_tracking_data": {
-                            "group": 7,
+                            "group": 5,
                             "offset": 0
                         },
-                        "pc": 95,
+                        "pc": 86,
                         "value": "[cast(fp + (-3), felt**)]"
                     },
                     {
                         "ap_tracking_data": {
-                            "group": 7,
+                            "group": 5,
                             "offset": 1
                         },
-                        "pc": 98,
+                        "pc": 89,
                         "value": "cast([fp + (-3)] + 2, felt*)"
                     }
                 ],
@@ -27123,7 +25963,7 @@
             },
             "starkware.starknet.common.syscalls.get_contract_address": {
                 "decorators": [],
-                "pc": 102,
+                "pc": 93,
                 "type": "function"
             },
             "starkware.starknet.common.syscalls.get_contract_address.Args": {
@@ -27157,18 +25997,18 @@
                 "references": [
                     {
                         "ap_tracking_data": {
-                            "group": 8,
+                            "group": 6,
                             "offset": 0
                         },
-                        "pc": 102,
+                        "pc": 93,
                         "value": "[cast(fp + (-3), felt**)]"
                     },
                     {
                         "ap_tracking_data": {
-                            "group": 8,
+                            "group": 6,
                             "offset": 1
                         },
-                        "pc": 105,
+                        "pc": 96,
                         "value": "cast([fp + (-3)] + 2, felt*)"
                     }
                 ],
@@ -27176,7 +26016,7 @@
             },
             "starkware.starknet.common.syscalls.get_tx_info": {
                 "decorators": [],
-                "pc": 125,
+                "pc": 116,
                 "type": "function"
             },
             "starkware.starknet.common.syscalls.get_tx_info.Args": {
@@ -27210,18 +26050,18 @@
                 "references": [
                     {
                         "ap_tracking_data": {
-                            "group": 11,
+                            "group": 9,
                             "offset": 0
                         },
-                        "pc": 125,
+                        "pc": 116,
                         "value": "[cast(fp + (-3), felt**)]"
                     },
                     {
                         "ap_tracking_data": {
-                            "group": 11,
+                            "group": 9,
                             "offset": 1
                         },
-                        "pc": 128,
+                        "pc": 119,
                         "value": "cast([fp + (-3)] + 2, felt*)"
                     }
                 ],
@@ -27229,7 +26069,7 @@
             },
             "starkware.starknet.common.syscalls.storage_read": {
                 "decorators": [],
-                "pc": 109,
+                "pc": 100,
                 "type": "function"
             },
             "starkware.starknet.common.syscalls.storage_read.Args": {
@@ -27268,18 +26108,18 @@
                 "references": [
                     {
                         "ap_tracking_data": {
-                            "group": 9,
+                            "group": 7,
                             "offset": 0
                         },
-                        "pc": 109,
+                        "pc": 100,
                         "value": "[cast(fp + (-4), felt**)]"
                     },
                     {
                         "ap_tracking_data": {
-                            "group": 9,
+                            "group": 7,
                             "offset": 1
                         },
-                        "pc": 113,
+                        "pc": 104,
                         "value": "cast([fp + (-4)] + 3, felt*)"
                     }
                 ],
@@ -27287,7 +26127,7 @@
             },
             "starkware.starknet.common.syscalls.storage_write": {
                 "decorators": [],
-                "pc": 117,
+                "pc": 108,
                 "type": "function"
             },
             "starkware.starknet.common.syscalls.storage_write.Args": {
@@ -27330,18 +26170,18 @@
                 "references": [
                     {
                         "ap_tracking_data": {
-                            "group": 10,
+                            "group": 8,
                             "offset": 0
                         },
-                        "pc": 117,
+                        "pc": 108,
                         "value": "[cast(fp + (-5), felt**)]"
                     },
                     {
                         "ap_tracking_data": {
-                            "group": 10,
+                            "group": 8,
                             "offset": 1
                         },
-                        "pc": 122,
+                        "pc": 113,
                         "value": "cast([fp + (-5)] + 3, felt*)"
                     }
                 ],
@@ -27354,155 +26194,147 @@
             "references": [
                 {
                     "ap_tracking_data": {
-                        "group": 2,
+                        "group": 1,
                         "offset": 0
                     },
-                    "pc": 9,
+                    "pc": 3,
                     "value": "[cast(fp + (-3), felt*)]"
                 },
                 {
                     "ap_tracking_data": {
-                        "group": 2,
+                        "group": 1,
                         "offset": 3
                     },
-                    "pc": 16,
+                    "pc": 10,
                     "value": "[cast(ap, felt*)]"
                 },
                 {
                     "ap_tracking_data": {
-                        "group": 3,
+                        "group": 2,
                         "offset": 0
                     },
-                    "pc": 24,
+                    "pc": 18,
                     "value": "[cast(fp + (-4), felt*)]"
                 },
                 {
                     "ap_tracking_data": {
-                        "group": 3,
-                        "offset": 0
-                    },
-                    "pc": 24,
-                    "value": "[cast(fp + (-3), felt*)]"
-                },
-                {
-                    "ap_tracking_data": {
-                        "group": 4,
+                        "group": 2,
                         "offset": 0
                     },
-                    "pc": 30,
+                    "pc": 18,
                     "value": "[cast(fp + (-3), felt*)]"
                 },
                 {
                     "ap_tracking_data": {
-                        "group": 4,
+                        "group": 2,
                         "offset": 0
                     },
-                    "pc": 30,
-                    "value": "[cast([fp + (-4)], felt*)]"
+                    "pc": 18,
+                    "value": "[cast(fp + (-5), felt*)]"
                 },
                 {
                     "ap_tracking_data": {
-                        "group": 4,
+                        "group": 3,
                         "offset": 0
                     },
-                    "pc": 30,
-                    "value": "[cast([fp + (-4)] + 1, felt*)]"
+                    "pc": 63,
+                    "value": "[cast(fp + (-4), felt*)]"
                 },
                 {
                     "ap_tracking_data": {
-                        "group": 5,
+                        "group": 3,
                         "offset": 0
                     },
-                    "pc": 43,
+                    "pc": 63,
                     "value": "[cast(fp + (-3), felt*)]"
                 },
                 {
                     "ap_tracking_data": {
-                        "group": 5,
-                        "offset": 1
+                        "group": 4,
+                        "offset": 0
                     },
-                    "pc": 45,
-                    "value": "[cast(ap + (-1), felt*)]"
+                    "pc": 74,
+                    "value": "[cast(fp + (-7), felt**)]"
                 },
                 {
                     "ap_tracking_data": {
                         "group": 5,
-                        "offset": 2
+                        "offset": 0
                     },
-                    "pc": 63,
-                    "value": "[cast(ap + (-1), felt*)]"
+                    "pc": 86,
+                    "value": "[cast(fp + (-3), felt**)]"
                 },
                 {
                     "ap_tracking_data": {
                         "group": 6,
                         "offset": 0
                     },
-                    "pc": 83,
-                    "value": "[cast(fp + (-7), felt**)]"
+                    "pc": 93,
+                    "value": "[cast(fp + (-3), felt**)]"
                 },
                 {
                     "ap_tracking_data": {
                         "group": 7,
                         "offset": 0
                     },
-                    "pc": 95,
-                    "value": "[cast(fp + (-3), felt**)]"
+                    "pc": 100,
+                    "value": "[cast(fp + (-4), felt**)]"
                 },
                 {
                     "ap_tracking_data": {
                         "group": 8,
                         "offset": 0
                     },
-                    "pc": 102,
-                    "value": "[cast(fp + (-3), felt**)]"
+                    "pc": 108,
+                    "value": "[cast(fp + (-5), felt**)]"
                 },
                 {
                     "ap_tracking_data": {
                         "group": 9,
                         "offset": 0
                     },
-                    "pc": 109,
-                    "value": "[cast(fp + (-4), felt**)]"
+                    "pc": 116,
+                    "value": "[cast(fp + (-3), felt**)]"
                 },
                 {
                     "ap_tracking_data": {
                         "group": 10,
                         "offset": 0
                     },
-                    "pc": 117,
-                    "value": "[cast(fp + (-5), felt**)]"
+                    "pc": 123,
+                    "value": "[cast(fp + (-4), felt*)]"
                 },
                 {
                     "ap_tracking_data": {
-                        "group": 11,
+                        "group": 10,
                         "offset": 0
                     },
-                    "pc": 125,
-                    "value": "[cast(fp + (-3), felt**)]"
+                    "pc": 123,
+                    "value": "[cast(fp + (-3), felt*)]"
                 },
                 {
                     "ap_tracking_data": {
-                        "group": 12,
+                        "group": 10,
                         "offset": 0
                     },
-                    "pc": 132,
-                    "value": "[cast(fp + (-4), felt*)]"
+                    "pc": 123,
+                    "value": "[cast(fp + (-7), starkware.cairo.common.cairo_builtins.SignatureBuiltin**)]"
                 },
                 {
                     "ap_tracking_data": {
-                        "group": 12,
+                        "group": 11,
                         "offset": 0
                     },
-                    "pc": 132,
-                    "value": "[cast(fp + (-3), felt*)]"
+                    "pc": 128,
+                    "value": "[cast(fp + (-4), felt*)]"
                 },
                 {
                     "ap_tracking_data": {
-                        "group": 12,
+                        "group": 11,
                         "offset": 0
                     },
-                    "pc": 132,
-                    "value": "[cast(fp + (-7), starkware.cairo.common.cairo_builtins.SignatureBuiltin**)]"
+                    "pc": 128,
+                    "value": "[cast(fp + (-3), felt*)]"
                 }
             ]
         }
diff --git a/src/nile/artifacts/abis/Account.json b/src/nile/artifacts/abis/Account.json
index 09596f75..5c939afc 100644
--- a/src/nile/artifacts/abis/Account.json
+++ b/src/nile/artifacts/abis/Account.json
@@ -29,7 +29,7 @@
     {
         "inputs": [
             {
-                "name": "public_key",
+                "name": "publicKey",
                 "type": "felt"
             }
         ],
diff --git a/src/nile/cli.py b/src/nile/cli.py
old mode 100755
new mode 100644
index 2c784ff2..80daa459
--- a/src/nile/cli.py
+++ b/src/nile/cli.py
@@ -9,10 +9,8 @@
 from nile.core.call_or_invoke import call_or_invoke as call_or_invoke_command
 from nile.core.clean import clean as clean_command
 from nile.core.compile import compile as compile_command
-from nile.core.declare import declare as declare_command
 from nile.core.deploy import deploy as deploy_command
 from nile.core.init import init as init_command
-from nile.core.install import install as install_command
 from nile.core.node import node as node_command
 from nile.core.plugins import load_plugins
 from nile.core.run import run as run_command
@@ -69,12 +67,6 @@ def init():
     init_command()
 
 
-@cli.command()
-def install():
-    """Install Cairo."""
-    install_command()
-
-
 @cli.command()
 @click.argument("path", nargs=1)
 @network_option
@@ -95,12 +87,23 @@ async def deploy(artifact, arguments, network, alias, abi=None):
 
 
 @cli.command()
-@click.argument("artifact", nargs=1)
-@network_option
+@click.argument("signer", nargs=1)
+@click.argument("contract_name", nargs=1)
+@click.option("--max_fee", nargs=1)
 @click.option("--alias")
-def declare(artifact, network, alias):
+@click.option("--overriding_path")
+@network_option
+async def declare(
+    signer, contract_name, network, max_fee=None, alias=None, overriding_path=None
+):
     """Declare StarkNet smart contract."""
-    declare_command(artifact, network, alias)
+    account = await Account(signer, network)
+    await account.declare(
+        contract_name,
+        alias=alias,
+        max_fee=max_fee,
+        overriding_path=overriding_path,
+    )
 
 
 @cli.command()
@@ -117,9 +120,11 @@ async def setup(signer, network):
 @click.argument("method", nargs=1)
 @click.argument("params", nargs=-1)
 @click.option("--max_fee", nargs=1)
+@click.option("--simulate", "query", flag_value="simulate")
+@click.option("--estimate_fee", "query", flag_value="estimate_fee")
 @network_option
-async def send(signer, address_or_alias, method, params, network, max_fee=None):
-    """Invoke a contract's method through an Account. Same usage as nile invoke."""
+async def send(signer, address_or_alias, method, params, network, max_fee=None, query=None):
+    """Invoke a contract's method through an Account."""
     account = await Account(signer, network)
     print(
         "Calling {} on {} with params: {}".format(
@@ -128,24 +133,10 @@ async def send(signer, address_or_alias, method, params, network, max_fee=None):
     )
     # address_or_alias is not normalized first here because
     # Account.send is part of Nile's public API and can accept hex addresses
-    out = await account.send(address_or_alias, method, params, max_fee=max_fee)
-    print(out)
-
-
-@cli.command()
-@click.argument("address_or_alias", nargs=1)
-@click.argument("method", nargs=1)
-@click.argument("params", nargs=-1)
-@click.option("--max_fee", nargs=1)
-@network_option
-def invoke(address_or_alias, method, params, network, max_fee=None):
-    """Invoke functions of StarkNet smart contracts."""
-    if not is_alias(address_or_alias):
-        address_or_alias = normalize_number(address_or_alias)
-
-    out = call_or_invoke_command(
-        address_or_alias, "invoke", method, params, network, max_fee=max_fee
+    out = await account.send(
+        address_or_alias, method, params, max_fee=max_fee, query_type=query
     )
+
     print(out)
 
 
diff --git a/src/nile/common.py b/src/nile/common.py
index 04644ea2..780900e8 100644
--- a/src/nile/common.py
+++ b/src/nile/common.py
@@ -1,6 +1,7 @@
 """nile common module."""
 import io
 import json
+import logging
 import os
 import re
 import sys
@@ -8,6 +9,10 @@
 
 from starkware.starknet.cli.starknet_cli import NETWORKS
 
+from starkware.crypto.signature.fast_pedersen_hash import pedersen_hash
+from starkware.starknet.core.os.class_hash import compute_class_hash
+from starkware.starknet.services.api.contract_class import ContractClass
+
 from nile.utils import normalize_number, str_to_felt
 
 CONTRACTS_DIRECTORY = "contracts"
@@ -19,6 +24,13 @@
 ACCOUNTS_FILENAME = "accounts.json"
 NODE_FILENAME = "node.json"
 RETRY_AFTER_SECONDS = 30
+TRANSACTION_VERSION = 1
+QUERY_VERSION_BASE = 2**128
+QUERY_VERSION = QUERY_VERSION_BASE + TRANSACTION_VERSION
+UNIVERSAL_DEPLOYER_ADDRESS = (
+    # subject to change
+    "0x1a8e53128903a412d86f33742d7f907f14ee8db566a14592cced70d52f96222"
+)
 
 
 def get_gateway():
@@ -98,7 +110,7 @@ def is_string(param):
 
 
 def is_alias(param):
-    """Identiy param as alias (instead of address)."""
+    """Identify param as alias (instead of address)."""
     return is_string(param)
 
 
@@ -143,3 +155,18 @@ def set_args(network):
     }
     ret_obj = SimpleNamespace(**args)
     return ret_obj
+def get_contract_class(contract_name, overriding_path=None):
+    """Return the contract_class for a given contract name."""
+    base_path = (
+        overriding_path if overriding_path else (BUILD_DIRECTORY, ABIS_DIRECTORY)
+    )
+    with open(f"{base_path[0]}/{contract_name}.json", "r") as fp:
+        contract_class = ContractClass.loads(fp.read())
+
+    return contract_class
+
+
+def get_hash(contract_name, overriding_path=None):
+    """Return the class_hash for a given contract name."""
+    contract_class = get_contract_class(contract_name, overriding_path)
+    return compute_class_hash(contract_class=contract_class, hash_func=pedersen_hash)
diff --git a/src/nile/core/account.py b/src/nile/core/account.py
index 9c355ff9..f5c093d6 100644
--- a/src/nile/core/account.py
+++ b/src/nile/core/account.py
@@ -5,10 +5,17 @@
 from dotenv import load_dotenv
 
 from nile import accounts, deployments
-from nile.common import is_alias
+from nile.common import (
+    QUERY_VERSION,
+    TRANSACTION_VERSION,
+    UNIVERSAL_DEPLOYER_ADDRESS,
+    get_contract_class,
+    is_alias,
+    normalize_number,
+)
 from nile.core.call_or_invoke import call_or_invoke
+from nile.core.declare import declare
 from nile.core.deploy import deploy
-from nile.utils import normalize_number
 from nile.utils.get_nonce import get_nonce_without_log as get_nonce
 
 try:
@@ -91,18 +98,10 @@ async def deploy(self):
 
         return address, index
 
-    async def send(self, address_or_alias, method, calldata, max_fee, nonce=None):
-        """Execute a tx going through an Account contract."""
-        if not is_alias(address_or_alias):
-            address_or_alias = normalize_number(address_or_alias)
-
-        target_address, _ = (
-            next(deployments.load(address_or_alias, self.network), None)
-            or address_or_alias
-        )
-
-        calldata = [int(x) for x in calldata]
-
+    async def declare(
+        self, contract_name, max_fee=None, nonce=None, alias=None, overriding_path=None
+    ):
+        """Declare a contract through an Account contract."""
         if nonce is None:
             nonce = int(await get_nonce(self.address, self.network))
 
@@ -111,11 +110,56 @@ async def send(self, address_or_alias, method, calldata, max_fee, nonce=None):
         else:
             max_fee = int(max_fee)
 
+        contract_class = get_contract_class(
+            contract_name=contract_name, overriding_path=overriding_path
+        )
+
+        sig_r, sig_s = self.signer.sign_declare(
+            sender=self.address,
+            contract_class=contract_class,
+            nonce=nonce,
+            max_fee=max_fee,
+        )
+
+        return await declare(
+            sender=self.address,
+            contract_name=contract_name,
+            signature=[sig_r, sig_s],
+            alias=alias,
+            network=self.network,
+            max_fee=max_fee,
+        )
+
+    def deploy_contract(
+        self, class_hash, salt, unique, calldata, max_fee=None, deployer_address=None
+    ):
+        """Deploy a contract through an Account contract."""
+        return self.send(
+            to=deployer_address or UNIVERSAL_DEPLOYER_ADDRESS,
+            method="deployContract",
+            calldata=[class_hash, salt, unique, len(calldata), *calldata],
+            max_fee=max_fee,
+        )
+
+    async def send(
+        self, address_or_alias, method, calldata, max_fee, nonce=None, query_type=None
+    ):
+        """Execute a query or invoke call for a tx going through an Account contract."""
+        # get target address with the right format
+        target_address = self._get_target_address(address_or_alias)
+
+        # process and parse arguments
+        calldata, max_fee, nonce = await self._process_arguments(calldata, max_fee, nonce)
+
+        # get tx version
+        tx_version = QUERY_VERSION if query_type else TRANSACTION_VERSION
+
         calldata, sig_r, sig_s = self.signer.sign_transaction(
             sender=self.address,
             calls=[[target_address, method, calldata]],
             nonce=nonce,
             max_fee=max_fee,
+            version=tx_version,
         )
 
         return await call_or_invoke(
@@ -126,4 +170,39 @@ async def send(self, address_or_alias, method, calldata, max_fee, nonce=None):
             network=self.network,
             signature=[str(sig_r), str(sig_s)],
             max_fee=str(max_fee),
+            query_flag=query_type,
         )
+
+    async def simulate(self, address_or_alias, method, calldata, max_fee, nonce=None):
+        """Simulate a tx going through an Account contract."""
+        return await self.send(address_or_alias, method, calldata, max_fee, nonce, "simulate")
+
+    async def estimate_fee(self, address_or_alias, method, calldata, max_fee, nonce=None):
+        """Estimate fee for a tx going through an Account contract."""
+        return await self.send(
+            address_or_alias, method, calldata, max_fee, nonce, "estimate_fee"
+        )
+
+    def _get_target_address(self, address_or_alias):
+        if not is_alias(address_or_alias):
+            address_or_alias = normalize_number(address_or_alias)
+
+        target_address, _ = (
+            next(deployments.load(address_or_alias, self.network), None)
+            or address_or_alias
+        )
+
+        return target_address
+
+    async def _process_arguments(self, calldata, max_fee, nonce):
+        calldata = [int(x) for x in calldata]
+
+        if nonce is None:
+            nonce = await get_nonce(self.address, self.network)
+
+        if max_fee is None:
+            max_fee = 0
+        else:
+            max_fee = int(max_fee)
+
+        return calldata, max_fee, nonce
diff --git a/src/nile/core/call_or_invoke.py b/src/nile/core/call_or_invoke.py
index e1703001..466d75e3 100644
--- a/src/nile/core/call_or_invoke.py
+++ b/src/nile/core/call_or_invoke.py
@@ -10,9 +10,21 @@
 
 
 async def call_or_invoke(
-    contract, type, method, params, network, signature=None, max_fee=None
+    contract, type, method, params, network, signature=None, max_fee=None, query_flag=None
 ):
-    """Call or invoke functions of StarkNet smart contracts."""
+
+    """
+    Call or invoke functions of StarkNet smart contracts.
+
+    @param contract: can be an address, an alias, or an Account instance.
+    @param type: can be either call or invoke.
+    @param method: the targeted function.
+    @param params: the targeted function arguments.
+    @param network: goerli, mainnet, or predefined networks file.
+    @param signature: optional signature for invoke transactions.
+    @param max_fee: optional max fee for invoke transactions.
+    @param query_flag: either simulate or estimate_fee
+    """
     if isinstance(contract, account.Account):
         address = contract.address
         abi = contract.abi_path
@@ -29,20 +41,21 @@ async def call_or_invoke(
         method,
     ]
 
-    params = prepare_params(params)
-
     if len(params) > 0:
         command_args.append("--inputs")
-        command_args.extend(params)
+        command_args.extend(prepare_params(params))
 
     if signature is not None:
         command_args.append("--signature")
-        command_args.extend(signature)
+        command_args.extend(prepare_params(signature))
 
     if max_fee is not None:
         command_args.append("--max_fee")
         command_args.append(max_fee)
 
+    if query_flag is not None:
+        command_args.append(f"--{query_flag}")
+
     args = set_args(network)
 
     if type == "call":
diff --git a/src/nile/core/declare.py b/src/nile/core/declare.py
index 52302c2a..c8c4fa8d 100644
--- a/src/nile/core/declare.py
+++ b/src/nile/core/declare.py
@@ -4,6 +4,7 @@
 from starkware.starknet.cli import starknet_cli
 
 from nile import deployments
+from nile.utils import hex_address
 from nile.common import (
     ABIS_DIRECTORY,
     BUILD_DIRECTORY,
@@ -36,11 +37,13 @@ async def declare(
     )
     contract = f"{base_path[0]}/{contract_name}.json"
 
+    max_fee = "0" if max_fee is None else str(max_fee)
+
     command_args = [
         "--contract",
         contract,
         "--sender",
-        hex(sender),
+        hex_address(sender),
         "--max_fee",
         max_fee,
     ]
@@ -57,7 +60,7 @@ async def declare(
 
     class_hash, tx_hash = parse_information(output)
     logging.info(
-        f"⏳ Declaration of {contract_name} successfully sent at {hex(class_hash)}"
+        f"⏳ Successfully sent declaration of {contract_name} as {hex(class_hash)}"
     )
     logging.info(f"🧾 Transaction hash: {hex(tx_hash)}")
 
diff --git a/src/nile/core/init.py b/src/nile/core/init.py
index 85c65e3c..84785037 100644
--- a/src/nile/core/init.py
+++ b/src/nile/core/init.py
@@ -1,30 +1,11 @@
 """Command to kickstart a Nile project."""
 import logging
-import subprocess
-import sys
 from distutils.dir_util import copy_tree
 from pathlib import Path
 
-from nile.core.install import install
-
 
 def init():
     """Kickstart a new Nile project."""
-    # install cairo dependencies
-    subprocess.check_call(
-        [sys.executable, "-m", "pip", "install", "ecdsa", "fastecdsa", "sympy"]
-    )
-
-    # install cairo within env
-    install()
-
-    # install testing dependencies
-    subprocess.check_call(
-        [sys.executable, "-m", "pip", "install", "pytest", "pytest-asyncio"]
-    )
-    logging.info("")
-    logging.info("✅ Dependencies successfully installed")
-
     # create project directories
     logging.info("🗄  Creating project directory tree")
 
diff --git a/src/nile/core/install.py b/src/nile/core/install.py
deleted file mode 100644
index 6df40cf2..00000000
--- a/src/nile/core/install.py
+++ /dev/null
@@ -1,13 +0,0 @@
-"""Command to install a specific version of Cairo."""
-import logging
-import subprocess
-import sys
-
-
-def install():
-    """Install Cairo package with the given tag."""
-    logging.info("🗄  Installing Cairo")
-    subprocess.check_call(
-        [sys.executable, "-m", "pip", "install", "cairo-lang", "starknet-devnet"]
-    )
-    logging.info("✨  Cairo successfully installed!")
diff --git a/src/nile/nre.py b/src/nile/nre.py
index 73ec9edd..421bee0e 100644
--- a/src/nile/nre.py
+++ b/src/nile/nre.py
@@ -4,7 +4,6 @@
 from nile.core.account import Account
 from nile.core.call_or_invoke import call_or_invoke
 from nile.core.compile import compile
-from nile.core.declare import declare
 from nile.core.deploy import deploy
 from nile.core.plugins import get_installed_plugins, skip_click_exit
 from nile.utils import normalize_number
@@ -25,10 +24,6 @@ def compile(self, contracts):
         """Compile a list of contracts."""
         return compile(contracts)
 
-    def declare(self, contract, alias=None, overriding_path=None):
-        """Declare a smart contract class."""
-        return declare(contract, self.network, alias)
-
     def deploy(
         self, contract, arguments=None, alias=None, overriding_path=None, abi=None
     ):
@@ -43,12 +38,6 @@ def call(self, address_or_alias, method, params=None):
             address_or_alias = normalize_number(address_or_alias)
         return call_or_invoke(address_or_alias, "call", method, params, self.network)
 
-    def invoke(self, address_or_alias, method, params=None):
-        """Invoke a mutable function in a smart contract."""
-        if not is_alias(address_or_alias):
-            address_or_alias = normalize_number(address_or_alias)
-        return call_or_invoke(address_or_alias, "invoke", method, params, self.network)
-
     def get_deployment(self, address_or_alias):
         """Get a deployment by its identifier (address or alias)."""
         if not is_alias(address_or_alias):
diff --git a/src/nile/signer.py b/src/nile/signer.py
index c7824ee3..da7d7851 100644
--- a/src/nile/signer.py
+++ b/src/nile/signer.py
@@ -3,12 +3,13 @@
 from starkware.crypto.signature.signature import private_to_stark_key, sign
 from starkware.starknet.core.os.transaction_hash.transaction_hash import (
     TransactionHashPrefix,
+    calculate_declare_transaction_hash,
     calculate_transaction_hash_common,
 )
 from starkware.starknet.definitions.general_config import StarknetChainId
 from starkware.starknet.public.abi import get_selector_from_name
 
-TRANSACTION_VERSION = 1
+from nile.common import TRANSACTION_VERSION
 
 
 class Signer:
@@ -23,7 +24,23 @@ def sign(self, message_hash):
         """Sign a message hash."""
         return sign(msg_hash=message_hash, priv_key=self.private_key)
 
-    def sign_transaction(self, sender, calls, nonce, max_fee):
+    def sign_declare(self, sender, contract_class, nonce, max_fee):
+        """Sign a declare transaction."""
+        if isinstance(sender, str):
+            sender = int(sender, 16)
+
+        transaction_hash = get_declare_hash(
+            sender=sender,
+            contract_class=contract_class,
+            max_fee=max_fee,
+            nonce=nonce,
+        )
+
+        return self.sign(message_hash=transaction_hash)
+
+    def sign_transaction(
+        self, sender, calls, nonce, max_fee, version=TRANSACTION_VERSION
+    ):
         """Sign a transaction."""
         call_array, calldata = from_call_to_call_array(calls)
         execute_calldata = [
@@ -42,6 +59,7 @@ def sign_transaction(self, sender, calls, nonce, max_fee):
             calldata=execute_calldata,
             nonce=nonce,
             max_fee=max_fee,
+            version=version,
         )
 
         sig_r, sig_s = self.sign(message_hash=transaction_hash)
@@ -68,11 +86,23 @@ def from_call_to_call_array(calls):
     return (call_array, calldata)
 
 
-def get_transaction_hash(prefix, account, calldata, nonce, max_fee):
+def get_declare_hash(sender, contract_class, max_fee, nonce):
+    """Compute the hash of a declare transaction."""
+    return calculate_declare_transaction_hash(
+        contract_class=contract_class,
+        chain_id=StarknetChainId.TESTNET.value,
+        sender_address=sender,
+        max_fee=max_fee,
+        version=TRANSACTION_VERSION,
+        nonce=nonce,
+    )
+
+
+def get_transaction_hash(prefix, account, calldata, nonce, max_fee, version):
     """Compute the hash of a transaction."""
     return calculate_transaction_hash_common(
         tx_hash_prefix=prefix,
-        version=TRANSACTION_VERSION,
+        version=version,
         contract_address=account,
         entry_point_selector=0,
         calldata=calldata,
diff --git a/src/nile/utils/__init__.py b/src/nile/utils/__init__.py
index d38a33fe..66451fe2 100644
--- a/src/nile/utils/__init__.py
+++ b/src/nile/utils/__init__.py
@@ -16,8 +16,6 @@
 TRUE = 1
 FALSE = 0
 
-TRANSACTION_VERSION = 0
-
 
 _root = Path(__file__).parent.parent
 
diff --git a/src/nile/utils/get_nonce.py b/src/nile/utils/get_nonce.py
index 1c2f9861..597b0aba 100644
--- a/src/nile/utils/get_nonce.py
+++ b/src/nile/utils/get_nonce.py
@@ -25,4 +25,5 @@ async def get_nonce_without_log(contract_address, network):
 
     args = set_args(network)
 
-    return await capture_stdout(starknet_cli.get_nonce(args=args, command_args=command))
+    output = await capture_stdout(starknet_cli.get_nonce(args=args, command_args=command))
+    return int(output)

From f6c7933b2a38728362aac253937421c2a2c26888 Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Fri, 28 Oct 2022 15:42:22 -0400
Subject: [PATCH 025/109] fix conflicts

---
 CONTRIBUTING.md |  18 ++++-----
 README.md       | 103 +++++++++++++++++++++---------------------------
 setup.cfg       |   8 +++-
 3 files changed, 61 insertions(+), 68 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e96866e7..89728da3 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -33,15 +33,7 @@ As a contributor, you are expected to fork this repository, work on your own for
     git checkout -b fix/some-bug-#123
     ```
 
-3. Make your changes, add your files, commit, and push to your fork.
-
-    ```sh
-    git add some_file.py
-    git commit "Fix some bug #123"
-    git push origin fix/some-bug-#123
-    ```
-
-4. Run tests, linter, etc. This can be done by running local continuous integration and make sure it passes.
+3. Make your changes and run tests, linter, etc. This can be done by running local continuous integration and make sure it passes.
 
     ```bash
     tox
@@ -49,6 +41,14 @@ As a contributor, you are expected to fork this repository, work on your own for
     tox -e lint
     ```
 
+4. Add your files, commit, and push to your fork.
+
+    ```sh
+    git add some_file.py
+    git commit "Fix some bug #123"
+    git push origin fix/some-bug-#123
+    ```
+
 5. Go to [github.com/OpenZeppelin/nile](https://github.com/OpenZeppelin/nile) in your web browser and issue a new pull request.
     Begin the body of the PR with "Fixes #123" or "Resolves #123" to link the PR to the issue that it is resolving.
     *IMPORTANT* Read the PR template very carefully and make sure to follow all the instructions. These instructions
diff --git a/README.md b/README.md
index 527107f1..0b335674 100644
--- a/README.md
+++ b/README.md
@@ -33,13 +33,10 @@ nile init
 ...
 ✨  Cairo successfully installed!
 ...
-✅ Dependencies successfully installed
 🗄  Creating project directory tree
 ⛵️ Nile project ready! Try running:
 ```
 
-This command creates the project directory structure and installs `cairo-lang`, `starknet-devnet`, `pytest`, and `pytest-asyncio` for you. The template includes a makefile to build the project (`make build`) and run tests (`make test`).
-
 ## Usage
 
 ### `node`
@@ -109,6 +106,8 @@ Creating artifacts/abis/ to store compilation artifacts
 
 ### `deploy`
 
+> NOTICE: this method doesn't use an account, which will be deprecated very soon as StarkNet makes deployments from accounts mandatory.
+
 ```sh
 nile deploy contract --alias my_contract
 
@@ -125,23 +124,6 @@ A few things to notice here:
 4. By default Nile works on local, but you can use the `--network` parameter to interact with `mainnet`, `goerli`, and the default `localhost`.
 5. By default, the ABI corresponding to the contract will be registered with the deployment. To register a different ABI file, use the `--abi` parameter.
 
-### `declare`
-
-```sh
-nile declare contract --alias my_contract
-
-🚀 Declaring contract
-⏳ Declaration of contract successfully sent at 0x07ec10eb0758f7b1bc5aed0d5b4d30db0ab3c087eba85d60858be46c1a5e4680
-📦 Registering declaration as my_contract in localhost.declarations.txt
-```
-
-A few things to notice here:
-
-1. `nile declare <contract_name>` looks for an artifact with the same name
-2. This created a `localhost.declarations.txt` file storing all data related to my declarations
-3. The `--alias` parameter lets me create a unique identifier for future interactions, if no alias is set then the contract's address can be used as identifier
-4. By default Nile works on local, but you can use the `--network` parameter to interact with `mainnet`, `goerli`, and the default `localhost`.
-
 ### `setup`
 
 Deploy an Account associated with a given private key.
@@ -154,17 +136,16 @@ You can find an example `.env` file in `example.env`. These are private keys onl
 nile setup <private_key_alias>
 
 🚀 Deploying Account
-🌕 artifacts/Account.json successfully deployed to 0x07db6b52c8ab888183277bc6411c400136fe566c0eebfb96fffa559b2e60e794
+⏳ ️Deployment of Account successfully sent at 0x07db6b52c8ab888183277bc6411c400136fe566c0eebfb96fffa559b2e60e794
+🧾 Transaction hash: 0x17
 📦 Registering deployment as account-0 in localhost.deployments.txt
-Invoke transaction was sent.
-Contract address: 0x07db6b52c8ab888183277bc6411c400136fe566c0eebfb96fffa559b2e60e794
-Transaction hash: 0x17
 ```
 
-A few things to notice here:
+A few things to note here:
 
 1. `nile setup <private_key_alias>` looks for an environment variable with the name of the private key alias
-2. This creates a `localhost.accounts.json` file storing all data related to accounts management
+2. This creates or updates `localhost.accounts.json` file storing all data related to accounts management
+3. The creates or updates `localhost.deployments.txt` file storing all data related to deployments
 
 ### `send`
 
@@ -186,27 +167,40 @@ Transaction hash: 0x1c
 
 Some things to note:
 
+- This sends the transaction to the network by default, but you can use the `--estimate_fee` flag to estimate the fee without sending the transaction, or the `--simulate` flag to get a traceback of the simulated execution.
 - `max_fee` defaults to `0`. Add `--max_fee <max_fee>` to set the maximum fee for the transaction
 - `network` defaults to the `localhost`. Add `--network <network>` to change the network for the transaction
 
-### `call` and `invoke`
+### `declare`
 
-Using `call` and `invoke`, we can perform read and write operations against our local node (or public one using the `--network mainnet` parameter). The syntax is:
+Very similar to `send`, but for declaring a contract based on its name through an account.
 
 ```sh
-nile <command> <contract_identifier> <method> [PARAM_1, PARAM2...]
+nile declare <private_key_alias> contract --alias my_contract
+
+🚀 Declaring contract
+⏳ Successfully sent declaration of contract as 0x07ec10eb0758f7b1bc5aed0d5b4d30db0ab3c087eba85d60858be46c1a5e4680
+🧾 Transaction hash: 0x7222604b048632326f6a016ccb16fbdea7e926cd9e2354544800667a970aee4
+📦 Registering declaration as my_contract in localhost.declarations.txt
 ```
 
-Where `<command>` is either `call` or `invoke` and `<contract_identifier>` is either our contract address or alias, as defined on `deploy`.
+A few things to notice here:
 
-```sh
-nile invoke my_contract increase_balance 1
+1. `nile declare <private_key_alias> <contract_name>` looks for an artifact with name `<contract_name>`
+2. This creates or updates a `localhost.declarations.txt` file storing all data related to your declarations
+3. The `--alias` parameter lets you create a unique identifier for future interactions, if no alias is set then the contract's address can be used as identifier
+4. By default Nile works on local, but you can use the `--network` parameter to interact with `mainnet`, `goerli`, and the default `localhost`.
 
-Invoke transaction was sent.
-Contract address: 0x07ec10eb0758f7b1bc5aed0d5b4d30db0ab3c087eba85d60858be46c1a5e4680
-Transaction hash: 0x1
+### `call`
+
+Using `call`, we can perform read operations against our local node or the specified public network. The syntax is:
+
+```sh
+nile call <contract_identifier> <method> [PARAM_1, PARAM2...]
 ```
 
+Where `<contract_identifier>` is either our contract address or alias, as defined on `deploy`.
+
 ```sh
 nile call my_contract get_balance
 
@@ -239,17 +233,6 @@ Please note:
 
 - `localhost` is the default network. Add `--network <network>` to change the network for the script
 
-### `get_declaration` (NRE only)
-
-Return the hash of a declared class. This can be useful in scenarios where a contract class is already declared with an alias prior to running a script.
-
-```python
-def run(nre):
-    predeclared_class = nre.get_declaration("alias")
-```
-
-> Note that this command is only available in the context of scripting in the Nile Runtime Environment.
-
 ### `clean`
 
 Deletes the `artifacts/` directory for a fresh start ❄️
@@ -262,14 +245,6 @@ nile clean
 ✨ Workspace clean, keep going!
 ```
 
-### `install`
-
-Install the latest version of the Cairo language and the starknet-devnet local node.
-
-```sh
-nile install
-```
-
 ### `version`
 
 Print out the Nile version
@@ -391,7 +366,7 @@ def run(nre):
 
 > Please note that the list of accounts includes only those that exist in the local `<network>.accounts.json` file. In a recent release we added a flag to the command, to get predeployed accounts if the network you are connected to is a [starknet-devnet](https://github.com/Shard-Labs/starknet-devnet) instance.
 
-### `get-accounts --predeployed`
+### `get-accounts --predeployed (only starknet-devnet)`
 
 This flag retrieves the predeployed accounts if the network you are connecting to is a [starknet-devnet](https://github.com/Shard-Labs/starknet-devnet) instance.
 
@@ -426,6 +401,18 @@ Retrieves the nonce for the given contract address (usually an account).
 nile get-nonce <contract_address>
 ```
 
+### `get_declaration` (NRE only)
+
+Return the hash of a declared class. This can be useful in scenarios where a contract class is already declared with an alias prior to running a script.
+
+```python
+def run(nre):
+    predeclared_class = nre.get_declaration("alias")
+```
+
+> Note that this command is only available in the context of scripting in the Nile Runtime Environment.
+
+
 ## Short string literals
 
 From [cairo-lang docs](https://www.cairo-lang.org/docs/how_cairo_works/consts.html#short-string-literals): A short string is a string whose length is at most 31 characters, and therefore can fit into a single field element.
@@ -500,14 +487,16 @@ OpenZeppelin Nile exists thanks to its contributors. There are many ways you can
 
 ## Hacking on Nile
 
-Nile uses tox to manage development tasks, you can get a list of
-available task with `tox -av`.
+Nile uses tox to manage development tasks. Here are some hints to play with the source code:
 
 - Install a development version of the package with `python -m pip install .`
+- Install tox for development tasks with `python -m pip install tox`
+- Get a list of available tasks with `tox -av`
 - Build the package with `tox -e build`
 - Format all files with `tox -e format`
 - Check files formatting with `tox -e lint`
 
+
 ### Testing
 
 To run tests:
diff --git a/setup.cfg b/setup.cfg
index c6f4a39c..34c47a19 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -20,7 +20,7 @@ include_package_data = True
 package_dir =
     =src
 
-python_requires = >=3.7
+python_requires = >=3.8,<3.10
 
 install_requires =
     anyio>=3.6.1
@@ -28,6 +28,11 @@ install_requires =
     click>=8.0,<9.0
     importlib-metadata>=4.0
     python-dotenv>=0.19.2
+    starknet-devnet>=0.3.1,<0.3.4
+    cairo-lang==0.10.0
+    pytest>=7.1.3
+    pytest-asyncio>=0.19.0
+    requests>=2.28.1
 
 [options.packages.find]
 where = src
@@ -36,7 +41,6 @@ exclude =
 
 [options.extras_require]
 testing =
-    cairo-lang
     setuptools
     tox
     twine

From e0f066c431f0283c38ae5d866ca2881f67054b69 Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Fri, 28 Oct 2022 15:43:16 -0400
Subject: [PATCH 026/109] fix account test conflicts

---
 tests/commands/test_account.py | 84 +++++++++++++++++++++++++++++++++-
 1 file changed, 83 insertions(+), 1 deletion(-)

diff --git a/tests/commands/test_account.py b/tests/commands/test_account.py
index e3ea4410..76028842 100644
--- a/tests/commands/test_account.py
+++ b/tests/commands/test_account.py
@@ -4,12 +4,19 @@
 
 import pytest
 
+from nile.common import (
+    ABIS_DIRECTORY,
+    BUILD_DIRECTORY,
+    QUERY_VERSION,
+    TRANSACTION_VERSION,
+)
 from nile.core.account import Account
 
 KEY = "TEST_KEY"
 NETWORK = "goerli"
 MOCK_ADDRESS = "0x123"
 MOCK_INDEX = 0
+MAX_FEE = 10
 
 
 @pytest.fixture(autouse=True)
@@ -103,7 +110,11 @@ async def test_send_sign_transaction_and_execute():
 
         # Check values are correctly passed to 'sign_transaction'
         account.signer.sign_transaction.assert_called_once_with(
-            calls=[send_args], nonce=nonce, sender=account.address, max_fee=1
+            calls=[send_args],
+            nonce=nonce,
+            sender=account.address,
+            max_fee=1,
+            version=TRANSACTION_VERSION,
         )
 
         # Check values are correctly passed to '__execute__'
@@ -115,4 +126,75 @@ async def test_send_sign_transaction_and_execute():
             params=calldata,
             signature=[str(sig_r), str(sig_s)],
             type="invoke",
+            query_flag=None,
         )
+
+
+@pytest.mark.asyncio
+async def test_estimate_fee():
+    account = await Account(KEY, NETWORK)
+    with patch("nile.core.account.Account.send", new=AsyncMock()):
+
+        await account.estimate_fee(account.address, "method", [1, 2, 3], max_fee=0)
+
+        account.send.assert_called_once_with(
+            account.address, "method", [1, 2, 3], 0, None, "estimate_fee"
+        )
+
+
+@pytest.mark.asyncio
+async def test_simulate():
+    account = await Account(KEY, NETWORK)
+    with patch("nile.core.account.Account.send", new=AsyncMock()):
+
+        await account.simulate(account.address, "method", [1, 2, 3], max_fee=0)
+
+        account.send.assert_called_once_with(
+            account.address, "method", [1, 2, 3], 0, None, "simulate"
+        )
+
+
+#@pytest.mark.asyncio
+#@pytest.mark.parametrize("query_type", ["estimate_fee", "simulate"])
+#async def test_execute_query(query_type):
+#    with patch("nile.core.account.get_nonce", new=AsyncMock()) as mock_nonce:
+#        with patch("nile.core.call_or_invoke", new=AsyncMock()) as mock_call:
+#            with patch("nile.core.account.Account.send", new=AsyncMock()):
+#                with patch("nile.core.account.Signer.sign_transaction", new=AsyncMock()) as mock_sign:
+#                    mock_nonce.return_value = 0
+#                    account = await Account(KEY, NETWORK)
+#
+#                    send_args = [account.address, "method", [1, 2, 3]]
+#                    calldata = ["111", "222", "333"]
+#                    sig_r, sig_s = [999, 888]
+#                    return_signature = [calldata, sig_r, sig_s]
+#                    mock_sign.return_value = return_signature
+#
+#
+#                    # Mock sign_transaction
+#                    #account.signer.sign_transaction = MagicMock(return_value=return_signature)
+#
+#                    await account.send(
+#                        account.address, "method", [1, 2, 3], max_fee=MAX_FEE, query_type=query_type
+#                    )
+#
+#                    #mock_sign.assert_called_once_with(
+#                    #    calls=[send_args],
+#                    #    nonce=0,
+#                    #    sender=account.address,
+#                    #    max_fee=MAX_FEE,
+#                    #    version=QUERY_VERSION,
+#                    #)
+#
+#                    # Check query_flag is correctly passed
+#                    mock_call.assert_called_with(
+#                        contract=account,
+#                        max_fee=str(MAX_FEE),
+#                        method="__execute__",
+#                        network=NETWORK,
+#                        params=calldata,
+#                        signature=[str(sig_r), str(sig_s)],
+#                        type="invoke",
+#                        query_flag=query_type,
+#                    )
+#
\ No newline at end of file

From d2bbed30fed6984e40cae79189eff3053d564206 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Triay?= <martriay@gmail.com>
Date: Fri, 28 Oct 2022 20:27:33 -0300
Subject: [PATCH 027/109] add sign_deployment

---
 src/nile/signer.py | 48 ++++++++++++++++++++++++++++++++++++----------
 1 file changed, 38 insertions(+), 10 deletions(-)

diff --git a/src/nile/signer.py b/src/nile/signer.py
index da7d7851..3f48ccdc 100644
--- a/src/nile/signer.py
+++ b/src/nile/signer.py
@@ -5,6 +5,7 @@
     TransactionHashPrefix,
     calculate_declare_transaction_hash,
     calculate_transaction_hash_common,
+    calculate_deploy_account_transaction_hash
 )
 from starkware.starknet.definitions.general_config import StarknetChainId
 from starkware.starknet.public.abi import get_selector_from_name
@@ -24,6 +25,19 @@ def sign(self, message_hash):
         """Sign a message hash."""
         return sign(msg_hash=message_hash, priv_key=self.private_key)
 
+    def sign_deployment(self, contract_address, class_hash, calldata, salt, max_fee, nonce):
+        transaction_hash = get_deploy_account_hash(
+            contract_address,
+            class_hash,
+            calldata,
+            salt,
+            max_fee,
+            nonce
+        )
+
+        return self.sign(message_hash=transaction_hash)
+
+
     def sign_declare(self, sender, contract_class, nonce, max_fee):
         """Sign a declare transaction."""
         if isinstance(sender, str):
@@ -86,6 +100,20 @@ def from_call_to_call_array(calls):
     return (call_array, calldata)
 
 
+def get_transaction_hash(prefix, account, calldata, nonce, max_fee, version):
+    """Compute the hash of a transaction."""
+    return calculate_transaction_hash_common(
+        tx_hash_prefix=prefix,
+        version=version,
+        contract_address=account,
+        entry_point_selector=0,
+        calldata=calldata,
+        max_fee=max_fee,
+        chain_id=StarknetChainId.TESTNET.value,
+        additional_data=[nonce],
+    )
+
+
 def get_declare_hash(sender, contract_class, max_fee, nonce):
     """Compute the hash of a declare transaction."""
     return calculate_declare_transaction_hash(
@@ -98,15 +126,15 @@ def get_declare_hash(sender, contract_class, max_fee, nonce):
     )
 
 
-def get_transaction_hash(prefix, account, calldata, nonce, max_fee, version):
-    """Compute the hash of a transaction."""
-    return calculate_transaction_hash_common(
-        tx_hash_prefix=prefix,
-        version=version,
-        contract_address=account,
-        entry_point_selector=0,
-        calldata=calldata,
+def get_deploy_account_hash(contract_address, class_hash, calldata, salt, max_fee, nonce):
+    """Compute the hash of a declare transaction."""
+    return calculate_deploy_account_transaction_hash(
+        version=TRANSACTION_VERSION,
+        contract_address=contract_address,
+        class_hash=class_hash,
+        constructor_calldata=calldata,
         max_fee=max_fee,
-        chain_id=StarknetChainId.TESTNET.value,
-        additional_data=[nonce],
+        nonce=nonce,
+        salt=salt,
+        chain_id=StarknetChainId.TESTNET.value
     )

From aff6c49559d4065f43ff7c0c3cb10c1f0d4acd1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Triay?= <martriay@gmail.com>
Date: Fri, 28 Oct 2022 20:54:04 -0300
Subject: [PATCH 028/109] bump tox version

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 705fc965..4f1d8e1d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,7 +14,7 @@ passenv =
 extras =
     testing
 deps =
-    cairo-lang==0.10.0
+    cairo-lang==0.10.1
     starknet-devnet==0.3.4
     # See https://github.com/starkware-libs/cairo-lang/issues/52
     marshmallow-dataclass==8.5.3

From 41700961accf8560e05d2c54df9ac4e8cbb8c9db Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Mon, 31 Oct 2022 00:52:45 -0400
Subject: [PATCH 029/109] update account tests to async

---
 tests/commands/test_account.py | 86 +++++++++++++++++-----------------
 1 file changed, 42 insertions(+), 44 deletions(-)

diff --git a/tests/commands/test_account.py b/tests/commands/test_account.py
index 76028842..2a3e89d9 100644
--- a/tests/commands/test_account.py
+++ b/tests/commands/test_account.py
@@ -154,47 +154,45 @@ async def test_simulate():
         )
 
 
-#@pytest.mark.asyncio
-#@pytest.mark.parametrize("query_type", ["estimate_fee", "simulate"])
-#async def test_execute_query(query_type):
-#    with patch("nile.core.account.get_nonce", new=AsyncMock()) as mock_nonce:
-#        with patch("nile.core.call_or_invoke", new=AsyncMock()) as mock_call:
-#            with patch("nile.core.account.Account.send", new=AsyncMock()):
-#                with patch("nile.core.account.Signer.sign_transaction", new=AsyncMock()) as mock_sign:
-#                    mock_nonce.return_value = 0
-#                    account = await Account(KEY, NETWORK)
-#
-#                    send_args = [account.address, "method", [1, 2, 3]]
-#                    calldata = ["111", "222", "333"]
-#                    sig_r, sig_s = [999, 888]
-#                    return_signature = [calldata, sig_r, sig_s]
-#                    mock_sign.return_value = return_signature
-#
-#
-#                    # Mock sign_transaction
-#                    #account.signer.sign_transaction = MagicMock(return_value=return_signature)
-#
-#                    await account.send(
-#                        account.address, "method", [1, 2, 3], max_fee=MAX_FEE, query_type=query_type
-#                    )
-#
-#                    #mock_sign.assert_called_once_with(
-#                    #    calls=[send_args],
-#                    #    nonce=0,
-#                    #    sender=account.address,
-#                    #    max_fee=MAX_FEE,
-#                    #    version=QUERY_VERSION,
-#                    #)
-#
-#                    # Check query_flag is correctly passed
-#                    mock_call.assert_called_with(
-#                        contract=account,
-#                        max_fee=str(MAX_FEE),
-#                        method="__execute__",
-#                        network=NETWORK,
-#                        params=calldata,
-#                        signature=[str(sig_r), str(sig_s)],
-#                        type="invoke",
-#                        query_flag=query_type,
-#                    )
-#
\ No newline at end of file
+@pytest.mark.asyncio
+@pytest.mark.parametrize("query_type", ["estimate_fee", "simulate"])
+async def test_execute_query(query_type):
+    account = await Account(KEY, NETWORK)
+    with patch("nile.core.account.call_or_invoke", new=AsyncMock()) as mock_call:
+        with patch("nile.core.account.Signer.sign_transaction") as mock_sign:
+            send_args = [account.address, "method", [1, 2, 3]]
+            calldata = ["111", "222", "333"]
+            sig_r, sig_s = [999, 888]
+            return_signature = [calldata, sig_r, sig_s]
+
+            mock_sign.return_value = return_signature
+
+            await account.send(
+                account.address, "method", [1, 2, 3], max_fee=MAX_FEE, query_type=query_type
+            )
+
+            expected = {
+                "calls": [send_args],
+                "nonce": 0,
+                "sender": account.address,
+                "max_fee": MAX_FEE,
+                "version": QUERY_VERSION,
+            }
+            account.signer.sign_transaction.assert_called_once_with(
+                **expected
+            )
+
+            # Check query_flag is correctly passed
+            expected = {
+                "contract": account,
+                "max_fee": str(MAX_FEE),
+                "method": "__execute__",
+                "network": NETWORK,
+                "params": calldata,
+                "signature": [str(sig_r), str(sig_s)],
+                "type": "invoke",
+                "query_flag": query_type,
+            }
+            mock_call.assert_called_with(
+                **expected
+            )

From cb138a77a258fff38a67e564ac09949799346fcb Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Mon, 31 Oct 2022 01:20:51 -0400
Subject: [PATCH 030/109] update debug test to async

---
 tests/test_cli.py | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/tests/test_cli.py b/tests/test_cli.py
index b7ba6dcf..f0ceefde 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -9,7 +9,7 @@
 from signal import SIGINT
 from threading import Timer
 from time import sleep
-from unittest.mock import patch
+from unittest.mock import MagicMock, Mock, patch
 from urllib.error import URLError
 from urllib.request import urlopen
 
@@ -37,6 +37,14 @@ def tmp_working_dir(monkeypatch, tmp_path):
     return tmp_path
 
 
+class AsyncMock(Mock):
+    """Return asynchronous mock."""
+
+    async def __call__(self, *args, **kwargs):
+        """Return mocked coroutine."""
+        return super(AsyncMock, self).__call__(*args, **kwargs)
+
+
 def create_process(target, args):
     """Spawns another process in Python."""
     p = Process(target=target, args=args)
@@ -190,17 +198,13 @@ async def test_node_runs_gateway(opts, expected):
         ([MOCK_HASH, "--network", "mainnet", "--contracts_file", "example.txt"]),
     ],
 )
-@patch("nile.utils.debug.subprocess")
-async def test_debug(mock_subprocess, args):
+async def test_debug(args):
     # debug will hang without patch
-    mock_subprocess.check_output.return_value = json.dumps({"tx_status": "ACCEPTED"})
+    with patch("nile.utils.debug.capture_stdout", new=AsyncMock()) as mock_capture:
+        mock_capture.return_value = json.dumps({"tx_status": "ACCEPTED"})
 
-    result = await CliRunner().invoke(cli, ["debug", *args])
-
-    # Check status
-    assert result.exit_code == 0
+        result = await CliRunner().invoke(cli, ["debug", *args])
 
-    # Setup and assert expected output
-    expected = ["starknet", "tx_status", "--hash", MOCK_HASH]
+        # Check status
+        assert result.exit_code == 0
 
-    mock_subprocess.check_output.assert_called_once_with(expected)

From 552b42c275d5c7d0fe4856427fcc4898128c647a Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Mon, 31 Oct 2022 01:48:21 -0400
Subject: [PATCH 031/109] update get_accounts to async

---
 src/nile/cli.py                |  6 +++---
 src/nile/utils/get_accounts.py | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/nile/cli.py b/src/nile/cli.py
index 80daa459..d4355226 100644
--- a/src/nile/cli.py
+++ b/src/nile/cli.py
@@ -243,12 +243,12 @@ async def debug(tx_hash, network, contracts_file):
 @cli.command()
 @network_option
 @click.option("--predeployed/--registered", default=False)
-def get_accounts(network, predeployed):
+async def get_accounts(network, predeployed):
     """Retrieve and manage deployed accounts."""
     if not predeployed:
-        return get_accounts_command(network)
+        return await get_accounts_command(network)
     else:
-        return get_predeployed_accounts_command(network)
+        return await get_predeployed_accounts_command(network)
 
 
 @cli.command()
diff --git a/src/nile/utils/get_accounts.py b/src/nile/utils/get_accounts.py
index 538c4760..73b45007 100644
--- a/src/nile/utils/get_accounts.py
+++ b/src/nile/utils/get_accounts.py
@@ -15,7 +15,7 @@
 logging.getLogger("urllib3").setLevel(logging.WARNING)
 
 
-def get_accounts(network):
+async def get_accounts(network):
     """Retrieve deployed accounts."""
     try:
         total_accounts = current_index(network)
@@ -36,14 +36,14 @@ def get_accounts(network):
     for i in range(total_accounts):
         logging.info(f"{i}: {hex_address(addresses[i])}")
 
-        _account = _check_and_return_account(signers[i], pubkeys[i], network)
+        _account = await _check_and_return_account(signers[i], pubkeys[i], network)
         accounts.append(_account)
 
     logging.info("\n🚀 Successfully retrieved deployed accounts")
     return accounts
 
 
-def get_predeployed_accounts(network):
+async def get_predeployed_accounts(network):
     """Retrieve pre-deployed accounts."""
     endpoint = f"{GATEWAYS.get(network)}/predeployed_accounts"
 
@@ -71,7 +71,7 @@ def get_predeployed_accounts(network):
             "index": i,
         }
 
-        _account = _check_and_return_account(
+        _account = await _check_and_return_account(
             normalize_number(_accounts[i]["private_key"]),
             normalize_number(_accounts[i]["public_key"]),
             network,
@@ -84,8 +84,8 @@ def get_predeployed_accounts(network):
     return accounts
 
 
-def _check_and_return_account(signer, pubkey, network, predeployed_info=None):
-    account = Account(signer, network, predeployed_info)
+async def _check_and_return_account(signer, pubkey, network, predeployed_info=None):
+    account = await Account(signer, network, predeployed_info)
     assert (str(pubkey)) == str(
         account.signer.public_key
     ), "Signer pubkey does not match deployed pubkey"

From 910490ede93aa94320b69d6d5aab84f5b27cd1e4 Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Mon, 31 Oct 2022 01:48:46 -0400
Subject: [PATCH 032/109] start test refactor

---
 tests/commands/test_get_accounts.py | 86 +++++++++++++++--------------
 1 file changed, 45 insertions(+), 41 deletions(-)

diff --git a/tests/commands/test_get_accounts.py b/tests/commands/test_get_accounts.py
index 63dec290..c39e30b0 100644
--- a/tests/commands/test_get_accounts.py
+++ b/tests/commands/test_get_accounts.py
@@ -1,6 +1,6 @@
 """Tests for get-accounts command."""
 import logging
-from unittest.mock import MagicMock, patch
+from unittest.mock import Mock, MagicMock, patch
 
 import pytest
 from requests.exceptions import MissingSchema
@@ -57,12 +57,15 @@ def tmp_working_dir(monkeypatch, tmp_path):
     return tmp_path
 
 
-@pytest.fixture(autouse=True)
-def mock_subprocess():
-    with patch("nile.core.compile.subprocess") as mock_subprocess:
-        yield mock_subprocess
+class AsyncMock(Mock):
+    """Return asynchronous mock."""
+
+    async def __call__(self, *args, **kwargs):
+        """Return mocked coroutine."""
+        return super(AsyncMock, self).__call__(*args, **kwargs)
 
 
+@pytest.mark.asyncio
 @pytest.mark.parametrize(
     "private_keys, public_keys",
     [
@@ -70,13 +73,14 @@ def mock_subprocess():
         ([ALIASES[1], PUBKEYS[1]]),
     ],
 )
-def test__check_and_return_account_with_matching_keys(private_keys, public_keys):
+async def test__check_and_return_account_with_matching_keys(private_keys, public_keys):
     # Check matching public/private keys
-    account = _check_and_return_account(private_keys, public_keys, NETWORK)
+    account = await _check_and_return_account(private_keys, public_keys, NETWORK)
 
     assert type(account) is Account
 
 
+@pytest.mark.asyncio
 @pytest.mark.parametrize(
     "private_keys, public_keys",
     [
@@ -84,16 +88,16 @@ def test__check_and_return_account_with_matching_keys(private_keys, public_keys)
         ([ALIASES[1], PUBKEYS[0]]),
     ],
 )
-def test__check_and_return_account_with_mismatching_keys(private_keys, public_keys):
+async def test__check_and_return_account_with_mismatching_keys(private_keys, public_keys):
     # Check mismatched public/private keys
     with pytest.raises(AssertionError) as err:
-        _check_and_return_account(private_keys, public_keys, NETWORK)
+        await _check_and_return_account(private_keys, public_keys, NETWORK)
 
     assert "Signer pubkey does not match deployed pubkey" in str(err.value)
 
 
-def test_get_accounts_no_activated_accounts_feedback(capsys):
-    get_accounts(NETWORK)
+async def test_get_accounts_no_activated_accounts_feedback(capsys):
+    await get_accounts(NETWORK)
     # This test uses capsys in order to test the print statements (instead of logging)
     captured = capsys.readouterr()
 
@@ -106,45 +110,45 @@ def test_get_accounts_no_activated_accounts_feedback(capsys):
     )
 
 
-@patch("nile.utils.get_accounts.current_index", MagicMock(return_value=len(PUBKEYS)))
-@patch("nile.utils.get_accounts.open", MagicMock())
-@patch("nile.utils.get_accounts.json.load", MagicMock(return_value=MOCK_ACCOUNTS))
-def test_get_accounts_activated_accounts_feedback(caplog):
-    logging.getLogger().setLevel(logging.INFO)
-
-    # Default argument
-    get_accounts(NETWORK)
+async def test_get_accounts_activated_accounts_feedback(caplog):
+    with patch("nile.utils.get_accounts.current_index", return_value=len(PUBKEYS)):
+        with patch("nile.utils.get_accounts.open"):
+            with patch("nile.utils.get_accounts.json.load", return_value=MOCK_ACCOUNTS):
+                logging.getLogger().setLevel(logging.INFO)
 
-    # Check total accounts log
-    assert f"\nTotal registered accounts: {len(PUBKEYS)}\n" in caplog.text
+                # Default argument
+                await get_accounts(NETWORK)
 
-    # Check index/address log
-    for i in range(len(PUBKEYS)):
-        assert f"{INDEXES[i]}: {hex_address(ADDRESSES[i])}" in caplog.text
+                # Check total accounts log
+                assert f"\nTotal registered accounts: {len(PUBKEYS)}\n" in caplog.text
 
-    # Check final success log
-    assert "\n🚀 Successfully retrieved deployed accounts" in caplog.text
+                # Check index/address log
+                for i in range(len(PUBKEYS)):
+                    assert f"{INDEXES[i]}: {hex_address(ADDRESSES[i])}" in caplog.text
 
+                # Check final success log
+                assert "\n🚀 Successfully retrieved deployed accounts" in caplog.text
 
-@patch("nile.utils.get_accounts.current_index", MagicMock(return_value=len(PUBKEYS)))
-@patch("nile.utils.get_accounts.open", MagicMock())
-@patch("nile.utils.get_accounts.json.load", MagicMock(return_value=MOCK_ACCOUNTS))
-def test_get_accounts_with_keys():
 
-    with patch(
-        "nile.utils.get_accounts._check_and_return_account"
-    ) as mock_return_account:
-        result = get_accounts(NETWORK)
+@pytest.mark.asyncio
+async def test_get_accounts_with_keys():
+    with patch("nile.utils.get_accounts.current_index", return_value=len(PUBKEYS)):
+        with patch("nile.utils.get_accounts.open"):
+            with patch("nile.utils.get_accounts.json.load", return_value=MOCK_ACCOUNTS):
+                with patch(
+                    "nile.utils.get_accounts._check_and_return_account", new=AsyncMock()
+                ) as mock_return_account:
+                    result = await get_accounts(NETWORK)
 
-        # Check correct args are passed to `_check_and_receive_account`
-        for i in range(len(PUBKEYS)):
-            mock_return_account.assert_any_call(ALIASES[i], PUBKEYS[i], NETWORK)
+                    # Check correct args are passed to `_check_and_receive_account`
+                    for i in range(len(PUBKEYS)):
+                        mock_return_account.assert_any_call(ALIASES[i], PUBKEYS[i], NETWORK)
 
-        # Assert call count equals correct number of accounts
-        assert mock_return_account.call_count == len(PUBKEYS)
+                    # Assert call count equals correct number of accounts
+                    assert mock_return_account.call_count == len(PUBKEYS)
 
-        # Assert returned accounts array equals correct number of accounts
-        assert len(result) == len(PUBKEYS)
+                    # Assert returned accounts array equals correct number of accounts
+                    assert len(result) == len(PUBKEYS)
 
 
 @patch("nile.common.get_gateway", return_value=GATEWAYS)

From 8c4e3f24a27374d83317ebc90a01686a19814b8b Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Wed, 2 Nov 2022 00:17:29 -0400
Subject: [PATCH 033/109] add async to nre snippets

---
 README.md | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index 0b335674..fab245ed 100644
--- a/README.md
+++ b/README.md
@@ -213,13 +213,13 @@ Please note:
 
 ### `run`
 
-Execute a script in the context of Nile. The script must implement a `run(nre)` function to receive a `NileRuntimeEnvironment` object exposing Nile's scripting API.
+Execute a script in the context of Nile. The script must implement an asynchronous `run(nre)` function to receive a `NileRuntimeEnvironment` object exposing Nile's scripting API.
 
 ```python
 # path/to/script.py
 
-def run(nre):
-    address, abi = nre.deploy("contract", alias="my_contract")
+async def run(nre):
+    address, abi = await nre.deploy("contract", alias="my_contract")
     print(abi, address)
 ```
 
@@ -350,18 +350,18 @@ Retrieves a list of ready-to-use accounts which allows for easy scripting integr
 Next, write a script and call `get-accounts` to retrieve and use the deployed accounts.
 
 ```python
-def run(nre):
+async def run(nre):
 
     # fetch the list of deployed accounts
-    accounts = nre.get_accounts()
+    accounts = await nre.get_accounts()
 
     # then
-    accounts[0].send(...)
+    await accounts[0].send(...)
 
     # or
     alice, bob, *_ = accounts
-    alice.send(...)
-    bob.send(...)
+    await alice.send(...)
+    await bob.send(...)
 ```
 
 > Please note that the list of accounts includes only those that exist in the local `<network>.accounts.json` file. In a recent release we added a flag to the command, to get predeployed accounts if the network you are connected to is a [starknet-devnet](https://github.com/Shard-Labs/starknet-devnet) instance.
@@ -379,18 +379,18 @@ nile get-accounts --predeployed
 Or from the nile runtime environment for scripting:
 
 ```python
-def run(nre):
+async def run(nre):
 
     # fetch the list of pre-deployed accounts from devnet
-    accounts = nre.get_accounts(predeployed=True)
+    accounts = await nre.get_accounts(predeployed=True)
 
     # then
-    accounts[0].send(...)
+    await accounts[0].send(...)
 
     # or
     alice, bob, *_ = accounts
-    alice.send(...)
-    bob.send(...)
+    await alice.send(...)
+    await bob.send(...)
 ```
 
 ### `get-nonce`
@@ -406,13 +406,12 @@ nile get-nonce <contract_address>
 Return the hash of a declared class. This can be useful in scenarios where a contract class is already declared with an alias prior to running a script.
 
 ```python
-def run(nre):
-    predeclared_class = nre.get_declaration("alias")
+async def run(nre):
+    predeclared_class = await nre.get_declaration("alias")
 ```
 
 > Note that this command is only available in the context of scripting in the Nile Runtime Environment.
 
-
 ## Short string literals
 
 From [cairo-lang docs](https://www.cairo-lang.org/docs/how_cairo_works/consts.html#short-string-literals): A short string is a string whose length is at most 31 characters, and therefore can fit into a single field element.
@@ -496,7 +495,6 @@ Nile uses tox to manage development tasks. Here are some hints to play with the
 - Format all files with `tox -e format`
 - Check files formatting with `tox -e lint`
 
-
 ### Testing
 
 To run tests:

From 87621b2e570711e516aa3ea8091b03cf8888c89b Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Wed, 2 Nov 2022 00:19:06 -0400
Subject: [PATCH 034/109] add language to code block

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index fab245ed..a9d587c4 100644
--- a/README.md
+++ b/README.md
@@ -330,7 +330,7 @@ Retrieves a list of ready-to-use accounts which allows for easy scripting integr
 
 1. store private keys in a `.env`
 
-    ```
+    ```txt
     PRIVATE_KEY_ALIAS_1=286426666527820764590699050992975838532
     PRIVATE_KEY_ALIAS_2=263637040172279991633704324379452721903
     PRIVATE_KEY_ALIAS_3=325047780196174231475632140485641889884

From ce76753180ebdb379fb0ee98f7804b4a3327a32c Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Wed, 2 Nov 2022 02:05:35 -0400
Subject: [PATCH 035/109] fix url tests

---
 tests/test_common.py | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/tests/test_common.py b/tests/test_common.py
index 89099081..6bef568f 100644
--- a/tests/test_common.py
+++ b/tests/test_common.py
@@ -1,5 +1,6 @@
 """Tests for common library."""
 import pytest
+from unittest.mock import MagicMock, patch
 
 from nile.common import (
     capture_stdout,
@@ -57,8 +58,15 @@ def test_prepare_params(args, expected):
     ],
 )
 def test_get_gateway_url(network, expected):
-    url = get_gateway_url(network)
-    assert url == expected
+    if network is "localhost":
+        with patch("nile.common.GATEWAYS") as mock_gateways:
+            mock_gateways.get = MagicMock(return_value=expected)
+            url = get_gateway_url(network)
+            assert url == expected
+
+    else:
+        url = get_gateway_url(network)
+        assert url == expected
 
 
 @pytest.mark.parametrize(
@@ -70,8 +78,15 @@ def test_get_gateway_url(network, expected):
     ],
 )
 def test_get_feeder_url(network, expected):
-    url = get_feeder_url(network)
-    assert url == expected
+    if network is "localhost":
+        with patch("nile.common.GATEWAYS") as mock_gateways:
+            mock_gateways.get = MagicMock(return_value=expected)
+            url = get_feeder_url(network)
+            assert url == expected
+
+    else:
+        url = get_feeder_url(network)
+        assert url == expected
 
 
 @pytest.mark.asyncio

From ec61c355a9b63dbbd045b10d58877510aa1db9f8 Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Wed, 2 Nov 2022 02:26:57 -0400
Subject: [PATCH 036/109] fix tests

---
 tests/commands/test_debug.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/commands/test_debug.py b/tests/commands/test_debug.py
index aa427755..c44b2d6b 100644
--- a/tests/commands/test_debug.py
+++ b/tests/commands/test_debug.py
@@ -75,7 +75,8 @@ def test__locate_error_lines_with_abis_misformatted_line(mock_path, caplog):
     "See https://github.com/starkware-libs/cairo-lang/issues/27",
 )
 @patch("nile.utils.debug.capture_stdout")
-async def test_debug_feedback_with_message(mock_output, output, expected, caplog):
+@patch("nile.utils.debug.set_args")
+async def test_debug_feedback_with_message(mock_network_args, mock_output, output, expected, caplog):
     logging.getLogger().setLevel(logging.INFO)
     mock_output.return_value = output
 

From 122a481e562622349cab1af251756371c805ba85 Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Wed, 2 Nov 2022 02:30:11 -0400
Subject: [PATCH 037/109] fix formatting

---
 tests/commands/test_debug.py | 4 +++-
 tests/test_common.py         | 7 ++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/tests/commands/test_debug.py b/tests/commands/test_debug.py
index c44b2d6b..8aa5e57c 100644
--- a/tests/commands/test_debug.py
+++ b/tests/commands/test_debug.py
@@ -76,7 +76,9 @@ def test__locate_error_lines_with_abis_misformatted_line(mock_path, caplog):
 )
 @patch("nile.utils.debug.capture_stdout")
 @patch("nile.utils.debug.set_args")
-async def test_debug_feedback_with_message(mock_network_args, mock_output, output, expected, caplog):
+async def test_debug_feedback_with_message(
+    mock_network_args, mock_output, output, expected, caplog
+):
     logging.getLogger().setLevel(logging.INFO)
     mock_output.return_value = output
 
diff --git a/tests/test_common.py b/tests/test_common.py
index 6bef568f..1ae00b93 100644
--- a/tests/test_common.py
+++ b/tests/test_common.py
@@ -1,7 +1,8 @@
 """Tests for common library."""
-import pytest
 from unittest.mock import MagicMock, patch
 
+import pytest
+
 from nile.common import (
     capture_stdout,
     get_feeder_url,
@@ -58,7 +59,7 @@ def test_prepare_params(args, expected):
     ],
 )
 def test_get_gateway_url(network, expected):
-    if network is "localhost":
+    if network == "localhost":
         with patch("nile.common.GATEWAYS") as mock_gateways:
             mock_gateways.get = MagicMock(return_value=expected)
             url = get_gateway_url(network)
@@ -78,7 +79,7 @@ def test_get_gateway_url(network, expected):
     ],
 )
 def test_get_feeder_url(network, expected):
-    if network is "localhost":
+    if network == "localhost":
         with patch("nile.common.GATEWAYS") as mock_gateways:
             mock_gateways.get = MagicMock(return_value=expected)
             url = get_feeder_url(network)

From f0a2a62ae7ed1529b2d7e365996f570387688168 Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Wed, 2 Nov 2022 16:31:20 -0400
Subject: [PATCH 038/109] fix get_gateway handling

---
 src/nile/common.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/nile/common.py b/src/nile/common.py
index 3dca56dd..0989321d 100644
--- a/src/nile/common.py
+++ b/src/nile/common.py
@@ -33,14 +33,19 @@
 
 def get_gateway():
     """Get the StarkNet node details."""
-    try:
+    def _get_gateway():
         with open(NODE_FILENAME, "r") as f:
             gateway = json.load(f)
             return gateway
 
+    try:
+        return _get_gateway()
+
     except FileNotFoundError:
         with open(NODE_FILENAME, "w") as f:
             f.write('{"localhost": "http://127.0.0.1:5050/"}')
+        return _get_gateway()
+
 
 
 GATEWAYS = get_gateway()

From c8f92e105012062081b30b6c6d2820bcb3b78bf9 Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Wed, 2 Nov 2022 16:31:34 -0400
Subject: [PATCH 039/109] remove redundant mock

---
 tests/commands/test_debug.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/commands/test_debug.py b/tests/commands/test_debug.py
index 8aa5e57c..db3f8f02 100644
--- a/tests/commands/test_debug.py
+++ b/tests/commands/test_debug.py
@@ -75,9 +75,8 @@ def test__locate_error_lines_with_abis_misformatted_line(mock_path, caplog):
     "See https://github.com/starkware-libs/cairo-lang/issues/27",
 )
 @patch("nile.utils.debug.capture_stdout")
-@patch("nile.utils.debug.set_args")
 async def test_debug_feedback_with_message(
-    mock_network_args, mock_output, output, expected, caplog
+    mock_output, output, expected, caplog
 ):
     logging.getLogger().setLevel(logging.INFO)
     mock_output.return_value = output

From bf49f3f5f66ee378a9f65d9bf431ede8b3b9204f Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Wed, 2 Nov 2022 16:32:41 -0400
Subject: [PATCH 040/109] fix formatting

---
 src/nile/common.py           | 2 +-
 tests/commands/test_debug.py | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/nile/common.py b/src/nile/common.py
index 0989321d..0a0f41a7 100644
--- a/src/nile/common.py
+++ b/src/nile/common.py
@@ -33,6 +33,7 @@
 
 def get_gateway():
     """Get the StarkNet node details."""
+
     def _get_gateway():
         with open(NODE_FILENAME, "r") as f:
             gateway = json.load(f)
@@ -47,7 +48,6 @@ def _get_gateway():
         return _get_gateway()
 
 
-
 GATEWAYS = get_gateway()
 
 
diff --git a/tests/commands/test_debug.py b/tests/commands/test_debug.py
index db3f8f02..aa427755 100644
--- a/tests/commands/test_debug.py
+++ b/tests/commands/test_debug.py
@@ -75,9 +75,7 @@ def test__locate_error_lines_with_abis_misformatted_line(mock_path, caplog):
     "See https://github.com/starkware-libs/cairo-lang/issues/27",
 )
 @patch("nile.utils.debug.capture_stdout")
-async def test_debug_feedback_with_message(
-    mock_output, output, expected, caplog
-):
+async def test_debug_feedback_with_message(mock_output, output, expected, caplog):
     logging.getLogger().setLevel(logging.INFO)
     mock_output.return_value = output
 

From 0f5a7c85b8de38ea0993717f804a37dfa7291182 Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Wed, 2 Nov 2022 18:37:02 -0400
Subject: [PATCH 041/109] remove unused func

---
 tests/test_cli.py | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/tests/test_cli.py b/tests/test_cli.py
index fe387b52..5380d16e 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -37,14 +37,6 @@ def tmp_working_dir(monkeypatch, tmp_path):
     return tmp_path
 
 
-class AsyncMock(Mock):
-    """Return asynchronous mock."""
-
-    async def __call__(self, *args, **kwargs):
-        """Return mocked coroutine."""
-        return super(AsyncMock, self).__call__(*args, **kwargs)
-
-
 def create_process(target, args):
     """Spawns another process in Python."""
     p = Process(target=target, args=args)

From 5b2c644e31c45d8e42a21c1ff6dbd5fb4653d3b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Triay?= <martriay@gmail.com>
Date: Thu, 3 Nov 2022 20:13:46 -0300
Subject: [PATCH 042/109] fix linter

---
 src/nile/signer.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/nile/signer.py b/src/nile/signer.py
index 296ff590..1be0d913 100644
--- a/src/nile/signer.py
+++ b/src/nile/signer.py
@@ -4,8 +4,8 @@
 from starkware.starknet.core.os.transaction_hash.transaction_hash import (
     TransactionHashPrefix,
     calculate_declare_transaction_hash,
+    calculate_deploy_account_transaction_hash,
     calculate_transaction_hash_common,
-    calculate_deploy_account_transaction_hash
 )
 from starkware.starknet.definitions.general_config import StarknetChainId
 from starkware.starknet.public.abi import get_selector_from_name
@@ -30,7 +30,10 @@ def sign(self, message_hash):
         """Sign a message hash."""
         return sign(msg_hash=message_hash, priv_key=self.private_key)
 
-    def sign_deployment(self, contract_address, class_hash, calldata, salt, max_fee, nonce):
+    def sign_deployment(
+        self, contract_address, class_hash, calldata, salt, max_fee, nonce
+    ):
+        """Sign a deploy_account transaction."""
         transaction_hash = get_deploy_account_hash(
             contract_address,
             class_hash,
@@ -43,7 +46,6 @@ def sign_deployment(self, contract_address, class_hash, calldata, salt, max_fee,
 
         return self.sign(message_hash=transaction_hash)
 
-
     def sign_declare(self, sender, contract_class, nonce, max_fee):
         """Sign a declare transaction."""
         if isinstance(sender, str):
@@ -134,7 +136,9 @@ def get_declare_hash(sender, contract_class, max_fee, nonce, chain_id):
     )
 
 
-def get_deploy_account_hash(contract_address, class_hash, calldata, salt, max_fee, nonce, chain_id):
+def get_deploy_account_hash(
+    contract_address, class_hash, calldata, salt, max_fee, nonce, chain_id
+):
     """Compute the hash of a declare transaction."""
     return calculate_deploy_account_transaction_hash(
         version=TRANSACTION_VERSION,
@@ -144,5 +148,5 @@ def get_deploy_account_hash(contract_address, class_hash, calldata, salt, max_fe
         max_fee=max_fee,
         nonce=nonce,
         salt=salt,
-        chain_id=chain_id
+        chain_id=chain_id,
     )

From e170c4b864d4ed40b42663787dbc84102f0ab9e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Triay?= <martriay@gmail.com>
Date: Thu, 3 Nov 2022 20:17:36 -0300
Subject: [PATCH 043/109] bump devnet (to support depploy_account)

---
 setup.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.cfg b/setup.cfg
index b5f941ef..214051aa 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -26,7 +26,7 @@ install_requires =
     click>=8.0,<9.0
     importlib-metadata>=4.0
     python-dotenv>=0.19.2
-    starknet-devnet>=0.3.1
+    starknet-devnet>=0.3.5
     cairo-lang==0.10.1
     pytest>=7.1.3
     pytest-asyncio>=0.19.0

From 12b5a5749074fa076b05f3ed1dd2bd4b191d6498 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Triay?= <martriay@gmail.com>
Date: Thu, 3 Nov 2022 20:18:44 -0300
Subject: [PATCH 044/109] bump devnet (to support depploy_account)

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 4f1d8e1d..fd6641e2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,7 +15,7 @@ extras =
     testing
 deps =
     cairo-lang==0.10.1
-    starknet-devnet==0.3.4
+    starknet-devnet==0.3.5
     # See https://github.com/starkware-libs/cairo-lang/issues/52
     marshmallow-dataclass==8.5.3
 commands =

From 8075a2da1b7e1427696ad4b4d40967125ec35d51 Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Thu, 3 Nov 2022 19:36:26 -0400
Subject: [PATCH 045/109] clean up test

---
 tests/test_cli.py | 38 +-------------------------------------
 1 file changed, 1 insertion(+), 37 deletions(-)

diff --git a/tests/test_cli.py b/tests/test_cli.py
index c7467ee8..e2d64b42 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -9,7 +9,7 @@
 from signal import SIGINT
 from threading import Timer
 from time import sleep
-from unittest.mock import Mock, patch
+from unittest.mock import patch
 from urllib.error import URLError
 from urllib.request import urlopen
 
@@ -21,7 +21,6 @@
     ABIS_DIRECTORY,
     BUILD_DIRECTORY,
     CONTRACTS_DIRECTORY,
-    GATEWAYS,
     NODE_FILENAME,
 )
 from nile.utils import normalize_number
@@ -184,41 +183,6 @@ async def test_node_runs_gateway(opts, expected):
     assert gateway.get(network) == expected
 
 
-# @pytest.mark.asyncio
-# @pytest.mark.parametrize(
-#    "args",
-#    [
-#        ([MOCK_HASH, "--network", "goerli"]),
-#        ([MOCK_HASH, "--network", "goerli2"]),
-#        ([MOCK_HASH, "--network", "integration"]),
-#        ([MOCK_HASH, "--network", "mainnet", "--contracts_file", "example.txt"]),
-#    ],
-# )
-# @patch("nile.utils.debug.capture_stdout")
-# @patch("nile.utils.debug.set_args")
-# async def test_debug(mock_set_args, mock_capture, args):
-#    # debug will hang without patch
-#    mock_capture.return_value = json.dumps({"tx_status": "ACCEPTED"})
-#    network = args[2]
-#    if network in ["goerli2", "integration"]:
-#        mock_set_args.return_value = network
-#
-#    result = await CliRunner().invoke(cli, ["debug", *args])
-#
-#    # Check status
-#    assert result.exit_code == 0
-
-# Setup and assert expected output
-# expected = ["starknet", "tx_status", "--hash", MOCK_HASH]
-# mock_debug.assert_called_once()
-
-# network = args[2]
-# if network in ["goerli2", "integration"]:
-#    expected.append(f"--feeder_gateway_url={GATEWAYS.get(network)}")
-#
-# mock_subprocess.check_output.assert_called_once_with(expected)
-
-
 @pytest.mark.asyncio
 @pytest.mark.parametrize(
     "args",

From 70585472bfb8d9122de0a77361a2f3dd31791e0c Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Thu, 3 Nov 2022 19:37:00 -0400
Subject: [PATCH 046/109] fix network handling

---
 src/nile/common.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/nile/common.py b/src/nile/common.py
index 27c1f967..d2a1fae0 100644
--- a/src/nile/common.py
+++ b/src/nile/common.py
@@ -121,7 +121,8 @@ def is_alias(param):
 
 def get_gateway_url(network):
     """Return gateway URL for specified network."""
-    if network == "localhost":
+    networks = ["localhost", "goerli2", "integration"]
+    if network in networks:
         return GATEWAYS.get(network)
     else:
         network = "alpha-" + network
@@ -130,7 +131,8 @@ def get_gateway_url(network):
 
 def get_feeder_url(network):
     """Return feeder gateway URL for specified network."""
-    if network == "localhost":
+    networks = ["localhost", "goerli2", "integration"]
+    if network in networks:
         return GATEWAYS.get(network)
     else:
         network = "alpha-" + network

From f673b260ff0dc52461b15c32b9f3a6612bcd0eae Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Thu, 3 Nov 2022 19:37:29 -0400
Subject: [PATCH 047/109] fix tx_status calls

---
 src/nile/utils/debug.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/nile/utils/debug.py b/src/nile/utils/debug.py
index a33b8300..eaa47607 100644
--- a/src/nile/utils/debug.py
+++ b/src/nile/utils/debug.py
@@ -21,18 +21,17 @@ async def debug(tx_hash, network, contracts_file=None):
     """Use available contracts to help locate the error in a rejected transaction."""
     # Starknet CLI expects hex strings
     command_args = ["--hash", hex(tx_hash)]
-
     args = set_args(network)
 
-    output = await capture_stdout(
-        starknet_cli.tx_status(args=args, command_args=command_args)
-    )
-
     logging.info(
         "⏳ Querying the network to check transaction status and identify contracts..."
     )
 
     while True:
+        output = await capture_stdout(
+            starknet_cli.tx_status(args=args, command_args=command_args)
+        )
+
         receipt = json.loads(output)
         status = receipt["tx_status"]
 

From 448efc8b19fe8c474ac30d6a862e921b90f03ab1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Triay?= <martriay@gmail.com>
Date: Sat, 5 Nov 2022 01:39:09 -0300
Subject: [PATCH 048/109] add account.deploy with __validate_deploy__

---
 src/nile/common.py       | 13 +++++++++-
 src/nile/core/account.py | 43 ++++++++++++++++++++++++++-------
 src/nile/core/deploy.py  | 52 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 99 insertions(+), 9 deletions(-)

diff --git a/src/nile/common.py b/src/nile/common.py
index d2a1fae0..0b7f7105 100644
--- a/src/nile/common.py
+++ b/src/nile/common.py
@@ -7,9 +7,10 @@
 from types import SimpleNamespace
 
 from starkware.crypto.signature.fast_pedersen_hash import pedersen_hash
-from starkware.starknet.cli.starknet_cli import NETWORKS
+from starkware.starknet.cli.starknet_cli import NETWORKS, assert_tx_received
 from starkware.starknet.core.os.class_hash import compute_class_hash
 from starkware.starknet.services.api.contract_class import ContractClass
+from starkware.starknet.services.api.gateway.gateway_client import GatewayClient
 
 from nile.utils import normalize_number, str_to_felt
 
@@ -119,6 +120,16 @@ def is_alias(param):
     return is_string(param)
 
 
+async def get_gateway_response(network, tx, token):
+    """Execute transaction and return response."""
+    gateway_url = get_gateway_url(network)
+    gateway_client = GatewayClient(url=gateway_url)
+    gateway_response = await gateway_client.add_transaction(tx=tx, token=token)
+    assert_tx_received(gateway_response)
+
+    return gateway_response
+
+
 def get_gateway_url(network):
     """Return gateway URL for specified network."""
     networks = ["localhost", "goerli2", "integration"]
diff --git a/src/nile/core/account.py b/src/nile/core/account.py
index 396393f8..78635cdc 100644
--- a/src/nile/core/account.py
+++ b/src/nile/core/account.py
@@ -3,6 +3,9 @@
 import os
 
 from dotenv import load_dotenv
+from starkware.starknet.core.os.contract_address.contract_address import (
+    calculate_contract_address_from_hash,
+)
 
 from nile import accounts, deployments
 from nile.common import (
@@ -10,12 +13,13 @@
     TRANSACTION_VERSION,
     UNIVERSAL_DEPLOYER_ADDRESS,
     get_contract_class,
+    get_hash,
     is_alias,
     normalize_number,
 )
 from nile.core.call_or_invoke import call_or_invoke
 from nile.core.declare import declare
-from nile.core.deploy import deploy
+from nile.core.deploy import deploy_account
 from nile.utils.get_nonce import get_nonce_without_log as get_nonce
 
 try:
@@ -78,18 +82,41 @@ async def __init__(self, signer, network, predeployed_info=None):
             self.address = address
             self.index = index
 
-    async def deploy(self):
+    async def deploy(
+        self,
+        salt=0,
+        max_fee=None,
+        nonce=None,
+        query_type=None,
+    ):
         """Deploy an Account contract for the given private key."""
         index = accounts.current_index(self.network)
         pt = os.path.dirname(os.path.realpath(__file__)).replace("/core", "")
         overriding_path = (f"{pt}/artifacts", f"{pt}/artifacts/abis")
 
-        address, _ = await deploy(
-            "Account",
-            [self.signer.public_key],
-            self.network,
-            f"account-{index}",
-            overriding_path,
+        class_hash = get_hash("Account")
+        calldata = [self.signer.public_key]
+
+        contract_address = calculate_contract_address_from_hash(
+            salt=salt,
+            class_hash=class_hash,
+            calldata=calldata,
+            deployer_address=0,
+        )
+
+        signature = self.signer.sign_deployment(
+            contract_address, class_hash, calldata, salt, max_fee, nonce
+        )
+
+        address, _ = deploy_account(
+            network=self.network,
+            salt=salt,
+            calldata=calldata,
+            signature=signature,
+            max_fee=max_fee,
+            nonce=nonce,
+            query_type=query_type,
+            overriding_path=overriding_path,
         )
 
         accounts.register(
diff --git a/src/nile/core/deploy.py b/src/nile/core/deploy.py
index eaae9a82..a1b22f16 100644
--- a/src/nile/core/deploy.py
+++ b/src/nile/core/deploy.py
@@ -2,12 +2,17 @@
 import logging
 
 from starkware.starknet.cli import starknet_cli
+from starkware.starknet.services.api.gateway.transaction import DeployAccount
 
 from nile import deployments
 from nile.common import (
     ABIS_DIRECTORY,
     BUILD_DIRECTORY,
+    QUERY_VERSION,
+    TRANSACTION_VERSION,
     capture_stdout,
+    get_gateway_response,
+    get_hash,
     parse_information,
     prepare_params,
     set_args,
@@ -57,3 +62,50 @@ async def deploy(
 
     deployments.register(address, register_abi, network, alias)
     return address, register_abi
+
+
+async def deploy_account(
+    network,
+    salt,
+    calldata,
+    signature,
+    contract_name="Account",
+    max_fee=None,
+    nonce=0,
+    abi=None,
+    overriding_path=None,
+    alias=None,
+    query_type=None,
+):
+    """Deploy StarkNet smart contracts."""
+    logging.info(f"🚀 Deploying {contract_name}")
+
+    tx_version = QUERY_VERSION if query_type else TRANSACTION_VERSION
+    base_path = (
+        overriding_path if overriding_path else (BUILD_DIRECTORY, ABIS_DIRECTORY)
+    )
+    register_abi = abi if abi is not None else f"{base_path[1]}/{contract_name}.json"
+
+    class_hash = get_hash(contract_name)
+
+    tx = DeployAccount(
+        class_hash=class_hash,
+        constructor_calldata=calldata,
+        contract_address_salt=salt,
+        max_fee=max_fee,
+        nonce=nonce,
+        signature=signature,
+        version=tx_version,
+    )
+
+    response = await get_gateway_response(network, tx)
+    address = response["address"]
+    tx_hash = response["tx_hash"]
+
+    logging.info(
+        f"⏳ ️Deployment of {contract_name} successfully sent at {hex_address(address)}"
+    )
+    logging.info(f"🧾 Transaction hash: {hex(tx_hash)}")
+
+    deployments.register(address, register_abi, network, alias)
+    return address, register_abi

From b0c115907a774af7e287c57b26a431a02c71257e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Triay?= <martriay@gmail.com>
Date: Sat, 5 Nov 2022 01:52:25 -0300
Subject: [PATCH 049/109] support mainnet token

---
 src/nile/core/deploy.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/nile/core/deploy.py b/src/nile/core/deploy.py
index a1b22f16..9e929c5d 100644
--- a/src/nile/core/deploy.py
+++ b/src/nile/core/deploy.py
@@ -76,6 +76,7 @@ async def deploy_account(
     overriding_path=None,
     alias=None,
     query_type=None,
+    mainnet_token=None,
 ):
     """Deploy StarkNet smart contracts."""
     logging.info(f"🚀 Deploying {contract_name}")
@@ -98,7 +99,7 @@ async def deploy_account(
         version=tx_version,
     )
 
-    response = await get_gateway_response(network, tx)
+    response = await get_gateway_response(network, tx, mainnet_token)
     address = response["address"]
     tx_hash = response["tx_hash"]
 

From 57395fa4f8216b7f5601cd47ae6399214fef391b Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Sat, 5 Nov 2022 01:04:35 -0400
Subject: [PATCH 050/109] add call_cli func

---
 src/nile/common.py              |  8 ++++++++
 src/nile/core/call_or_invoke.py |  9 +++++----
 src/nile/core/declare.py        | 10 +++-------
 src/nile/core/deploy.py         |  8 ++------
 src/nile/utils/debug.py         | 10 +++-------
 src/nile/utils/get_nonce.py     | 13 ++++++-------
 6 files changed, 27 insertions(+), 31 deletions(-)

diff --git a/src/nile/common.py b/src/nile/common.py
index d2a1fae0..ed08137a 100644
--- a/src/nile/common.py
+++ b/src/nile/common.py
@@ -5,6 +5,7 @@
 import re
 import sys
 from types import SimpleNamespace
+from starkware.starknet.cli import starknet_cli
 
 from starkware.crypto.signature.fast_pedersen_hash import pedersen_hash
 from starkware.starknet.cli.starknet_cli import NETWORKS
@@ -179,3 +180,10 @@ def get_hash(contract_name, overriding_path=None):
     """Return the class_hash for a given contract name."""
     contract_class = get_contract_class(contract_name, overriding_path)
     return compute_class_hash(contract_class=contract_class, hash_func=pedersen_hash)
+
+
+def call_cli(cmd_name, args, command_args):
+    cmd = getattr(starknet_cli, cmd_name)
+    return capture_stdout(
+        cmd(args=args, command_args=command_args)
+    )
diff --git a/src/nile/core/call_or_invoke.py b/src/nile/core/call_or_invoke.py
index fb4abf78..b817961a 100644
--- a/src/nile/core/call_or_invoke.py
+++ b/src/nile/core/call_or_invoke.py
@@ -1,10 +1,10 @@
 """Command to call or invoke StarkNet smart contracts."""
 import logging
 
-from starkware.starknet.cli.starknet_cli import AbiFormatError, call, invoke
+from starkware.starknet.cli.starknet_cli import AbiFormatError
 
 from nile import deployments
-from nile.common import capture_stdout, prepare_params, set_args
+from nile.common import prepare_params, set_args, call_cli
 from nile.core import account
 from nile.utils import hex_address
 
@@ -66,13 +66,14 @@ async def call_or_invoke(
 
     if type == "call":
         try:
-            return await capture_stdout(call(args=args, command_args=command_args))
+            return await call_cli("call", args, command_args)
         except AbiFormatError as err:
             logging.error(err)
 
     elif type == "invoke":
         try:
-            return await capture_stdout(invoke(args=args, command_args=command_args))
+            return await call_cli("invoke", args, command_args)
+
         except BaseException as err:
             if "max_fee must be bigger than 0." in str(err):
                 logging.error(
diff --git a/src/nile/core/declare.py b/src/nile/core/declare.py
index 03086b29..f6f33def 100644
--- a/src/nile/core/declare.py
+++ b/src/nile/core/declare.py
@@ -1,14 +1,12 @@
 """Command to declare StarkNet smart contracts."""
 import logging
 
-from starkware.starknet.cli import starknet_cli
-
 from nile import deployments
 from nile.common import (
     ABIS_DIRECTORY,
     BUILD_DIRECTORY,
     DECLARATIONS_FILENAME,
-    capture_stdout,
+    call_cli,
     parse_information,
     prepare_params,
     set_args,
@@ -54,14 +52,12 @@ async def declare(
         command_args.extend(prepare_params(signature))
 
     if mainnet_token is not None:
-        command_args.apend("--token")
+        command_args.append("--token")
         command_args.extend(mainnet_token)
 
     args = set_args(network)
 
-    output = await capture_stdout(
-        starknet_cli.declare(args=args, command_args=command_args)
-    )
+    output = await call_cli("declare", args, command_args)
 
     class_hash, tx_hash = parse_information(output)
     logging.info(
diff --git a/src/nile/core/deploy.py b/src/nile/core/deploy.py
index eaae9a82..24ee1ba0 100644
--- a/src/nile/core/deploy.py
+++ b/src/nile/core/deploy.py
@@ -1,13 +1,11 @@
 """Command to deploy StarkNet smart contracts."""
 import logging
 
-from starkware.starknet.cli import starknet_cli
-
 from nile import deployments
 from nile.common import (
     ABIS_DIRECTORY,
     BUILD_DIRECTORY,
-    capture_stdout,
+    call_cli,
     parse_information,
     prepare_params,
     set_args,
@@ -45,9 +43,7 @@ async def deploy(
 
     args = set_args(network)
 
-    output = await capture_stdout(
-        starknet_cli.deploy(args=args, command_args=command_args)
-    )
+    output = await call_cli("deploy", args, command_args)
 
     address, tx_hash = parse_information(output)
     logging.info(
diff --git a/src/nile/utils/debug.py b/src/nile/utils/debug.py
index eaa47607..cf0988a2 100644
--- a/src/nile/utils/debug.py
+++ b/src/nile/utils/debug.py
@@ -6,13 +6,11 @@
 import re
 import time
 
-from starkware.starknet.cli import starknet_cli
-
 from nile.common import (
     BUILD_DIRECTORY,
     DEPLOYMENTS_FILENAME,
     RETRY_AFTER_SECONDS,
-    capture_stdout,
+    call_cli,
     set_args,
 )
 
@@ -28,9 +26,7 @@ async def debug(tx_hash, network, contracts_file=None):
     )
 
     while True:
-        output = await capture_stdout(
-            starknet_cli.tx_status(args=args, command_args=command_args)
-        )
+        output = await call_cli("tx_status", args, command_args)
 
         receipt = json.loads(output)
         status = receipt["tx_status"]
@@ -76,7 +72,7 @@ async def debug(tx_hash, network, contracts_file=None):
     command_args += ["--contracts", ",".join(contracts), "--error_message"]
     logging.info(f"🧾 Found contracts: {contracts}")
     logging.info("⏳ Querying the network with identified contracts...")
-    output = await starknet_cli.tx_status(args=args, command_args=command_args)
+    output = await call_cli("tx_status", args, command_args)
 
     logging.info(f"🧾 Error message:\n{output.decode()}")
     return output
diff --git a/src/nile/utils/get_nonce.py b/src/nile/utils/get_nonce.py
index 39b1dbd5..eecf1120 100644
--- a/src/nile/utils/get_nonce.py
+++ b/src/nile/utils/get_nonce.py
@@ -1,9 +1,7 @@
 """Retrieve nonce for a contract."""
 import logging
 
-from starkware.starknet.cli import starknet_cli
-
-from nile.common import capture_stdout, set_args
+from nile.common import call_cli, set_args
 
 
 async def get_nonce(contract_address, network):
@@ -21,11 +19,12 @@ async def get_nonce_without_log(contract_address, network):
     if not str(contract_address).startswith("0x"):
         contract_address = hex(int(contract_address))
 
-    command = ["--contract_address", contract_address]
+    command_args = ["--contract_address", contract_address]
 
     args = set_args(network)
 
-    output = await capture_stdout(
-        starknet_cli.get_nonce(args=args, command_args=command)
-    )
+    #output = await capture_stdout(
+    #    starknet_cli.get_nonce(args=args, command_args=command)
+    #)
+    output = await call_cli("get_nonce", args, command_args)
     return int(output)

From 13a5a3671866ff698c984bccbfb4e145922ba4e7 Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Sat, 5 Nov 2022 17:27:55 -0400
Subject: [PATCH 051/109] abstract command args

---
 src/nile/common.py              | 52 ++++++++++++++++++++++++++++++---
 src/nile/core/call_or_invoke.py | 29 +++++-------------
 src/nile/core/declare.py        | 37 +++++++----------------
 src/nile/core/deploy.py         | 21 +++++--------
 src/nile/utils/get_nonce.py     |  4 ---
 5 files changed, 75 insertions(+), 68 deletions(-)

diff --git a/src/nile/common.py b/src/nile/common.py
index ed08137a..7e5a4dba 100644
--- a/src/nile/common.py
+++ b/src/nile/common.py
@@ -5,9 +5,9 @@
 import re
 import sys
 from types import SimpleNamespace
-from starkware.starknet.cli import starknet_cli
 
 from starkware.crypto.signature.fast_pedersen_hash import pedersen_hash
+from starkware.starknet.cli import starknet_cli
 from starkware.starknet.cli.starknet_cli import NETWORKS
 from starkware.starknet.core.os.class_hash import compute_class_hash
 from starkware.starknet.services.api.contract_class import ContractClass
@@ -165,6 +165,51 @@ def set_args(network):
     return ret_obj
 
 
+def set_command_args(
+    contract_name=None,
+    arguments=None,
+    inputs=None,
+    signature=None,
+    max_fee=None,
+    query_flag=None,
+    overriding_path=None,
+    mainnet_token=None,
+):
+    """Set command args for StarkNet CLI call."""
+    command_args = []
+    if contract_name is not None:
+        base_path = (
+            overriding_path if overriding_path else (BUILD_DIRECTORY, ABIS_DIRECTORY)
+        )
+        contract = f"{base_path[0]}/{contract_name}.json"
+        command_args.append("--contract")
+        command_args.append(contract)
+
+    if inputs is not None:
+        command_args.append("--inputs")
+        command_args.extend(prepare_params(inputs))
+
+    if signature is not None:
+        command_args.append("--signature")
+        command_args.extend(prepare_params(signature))
+
+    if max_fee is not None:
+        command_args.append("--max_fee")
+        command_args.append(max_fee)
+
+    if mainnet_token is not None:
+        command_args.append("--token")
+        command_args.append(mainnet_token)
+
+    if query_flag is not None:
+        command_args.append(f"--{query_flag}")
+
+    if arguments is not None:
+        command_args.extend(arguments)
+
+    return command_args
+
+
 def get_contract_class(contract_name, overriding_path=None):
     """Return the contract_class for a given contract name."""
     base_path = (
@@ -183,7 +228,6 @@ def get_hash(contract_name, overriding_path=None):
 
 
 def call_cli(cmd_name, args, command_args):
+    """Make call to starknet_cli and return captured stdout."""
     cmd = getattr(starknet_cli, cmd_name)
-    return capture_stdout(
-        cmd(args=args, command_args=command_args)
-    )
+    return capture_stdout(cmd(args=args, command_args=command_args))
diff --git a/src/nile/core/call_or_invoke.py b/src/nile/core/call_or_invoke.py
index b817961a..eaa060bc 100644
--- a/src/nile/core/call_or_invoke.py
+++ b/src/nile/core/call_or_invoke.py
@@ -4,7 +4,7 @@
 from starkware.starknet.cli.starknet_cli import AbiFormatError
 
 from nile import deployments
-from nile.common import prepare_params, set_args, call_cli
+from nile.common import call_cli, set_args, set_command_args
 from nile.core import account
 from nile.utils import hex_address
 
@@ -37,33 +37,20 @@ async def call_or_invoke(
     else:
         address, abi = next(deployments.load(contract, network))
 
-    address = hex_address(address)
-    command_args = [
+    args = set_args(network)
+    command_args = set_command_args(
+        inputs=params, signature=signature, max_fee=max_fee, query_flag=query_flag
+    )
+
+    command_args += [
         "--address",
-        address,
+        hex_address(address),
         "--abi",
         abi,
         "--function",
         method,
     ]
 
-    if len(params) > 0:
-        command_args.append("--inputs")
-        command_args.extend(prepare_params(params))
-
-    if signature is not None:
-        command_args.append("--signature")
-        command_args.extend(prepare_params(signature))
-
-    if max_fee is not None:
-        command_args.append("--max_fee")
-        command_args.append(max_fee)
-
-    if query_flag is not None:
-        command_args.append(f"--{query_flag}")
-
-    args = set_args(network)
-
     if type == "call":
         try:
             return await call_cli("call", args, command_args)
diff --git a/src/nile/core/declare.py b/src/nile/core/declare.py
index f6f33def..6b512e54 100644
--- a/src/nile/core/declare.py
+++ b/src/nile/core/declare.py
@@ -3,13 +3,11 @@
 
 from nile import deployments
 from nile.common import (
-    ABIS_DIRECTORY,
-    BUILD_DIRECTORY,
     DECLARATIONS_FILENAME,
     call_cli,
     parse_information,
-    prepare_params,
     set_args,
+    set_command_args,
 )
 from nile.utils import hex_address
 
@@ -31,35 +29,22 @@ async def declare(
         file = f"{network}.{DECLARATIONS_FILENAME}"
         raise Exception(f"Alias {alias} already exists in {file}")
 
-    base_path = (
-        overriding_path if overriding_path else (BUILD_DIRECTORY, ABIS_DIRECTORY)
-    )
-    contract = f"{base_path[0]}/{contract_name}.json"
-
     max_fee = "0" if max_fee is None else str(max_fee)
 
-    command_args = [
-        "--contract",
-        contract,
-        "--sender",
-        hex_address(sender),
-        "--max_fee",
-        max_fee,
-    ]
-
-    if signature is not None:
-        command_args.append("--signature")
-        command_args.extend(prepare_params(signature))
-
-    if mainnet_token is not None:
-        command_args.append("--token")
-        command_args.extend(mainnet_token)
-
     args = set_args(network)
+    command_args = set_command_args(
+        contract_name=contract_name,
+        signature=signature,
+        max_fee=max_fee,
+        overriding_path=overriding_path,
+        mainnet_token=mainnet_token,
+    )
 
-    output = await call_cli("declare", args, command_args)
+    command_args += ["--sender", hex_address(sender)]
 
+    output = await call_cli("declare", args, command_args)
     class_hash, tx_hash = parse_information(output)
+
     logging.info(
         f"⏳ Successfully sent declaration of {contract_name} as {hex(class_hash)}"
     )
diff --git a/src/nile/core/deploy.py b/src/nile/core/deploy.py
index 24ee1ba0..ee2137ba 100644
--- a/src/nile/core/deploy.py
+++ b/src/nile/core/deploy.py
@@ -7,8 +7,8 @@
     BUILD_DIRECTORY,
     call_cli,
     parse_information,
-    prepare_params,
     set_args,
+    set_command_args,
 )
 from nile.utils import hex_address
 
@@ -30,22 +30,17 @@ async def deploy(
     )
     register_abi = abi if abi is not None else f"{base_path[1]}/{contract_name}.json"
 
-    contract = f"{base_path[0]}/{contract_name}.json"
-    command_args = ["--contract", contract]
-
-    if arguments:
-        command_args.append("--inputs")
-        command_args.extend(prepare_params(arguments))
-
-    if mainnet_token:
-        command_args.append("--token")
-        command_args.extend(mainnet_token)
-
     args = set_args(network)
+    command_args = set_command_args(
+        contract_name=contract_name,
+        inputs=arguments,
+        overriding_path=overriding_path,
+        mainnet_token=mainnet_token,
+    )
 
     output = await call_cli("deploy", args, command_args)
-
     address, tx_hash = parse_information(output)
+
     logging.info(
         f"⏳ ️Deployment of {contract_name} successfully sent at {hex_address(address)}"
     )
diff --git a/src/nile/utils/get_nonce.py b/src/nile/utils/get_nonce.py
index eecf1120..03d04ce6 100644
--- a/src/nile/utils/get_nonce.py
+++ b/src/nile/utils/get_nonce.py
@@ -20,11 +20,7 @@ async def get_nonce_without_log(contract_address, network):
         contract_address = hex(int(contract_address))
 
     command_args = ["--contract_address", contract_address]
-
     args = set_args(network)
 
-    #output = await capture_stdout(
-    #    starknet_cli.get_nonce(args=args, command_args=command)
-    #)
     output = await call_cli("get_nonce", args, command_args)
     return int(output)

From d7c0577daf0262932a25913d1aadb5f37ba99815 Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Sat, 5 Nov 2022 17:28:27 -0400
Subject: [PATCH 052/109] fix tests with call_cli

---
 tests/commands/test_debug.py   | 19 +++++----
 tests/commands/test_declare.py | 71 ++++++++++++++++------------------
 tests/test_cli.py              |  6 +--
 3 files changed, 49 insertions(+), 47 deletions(-)

diff --git a/tests/commands/test_debug.py b/tests/commands/test_debug.py
index aa427755..95bfab4e 100644
--- a/tests/commands/test_debug.py
+++ b/tests/commands/test_debug.py
@@ -2,7 +2,8 @@
 import logging
 import sys
 from pathlib import Path
-from unittest.mock import patch
+from unittest.mock import patch, AsyncMock
+import json
 
 import pytest
 
@@ -16,7 +17,11 @@
 ALIAS = "contract_alias"
 MOCK_FILE = 123
 ACCEPTED_OUT = b'{"tx_status": "ACCEPTED_ON_L2"}'
-REJECTED_OUT = b'{"tx_failure_reason": {"error_message": "E"}, "tx_status": "REJECTED"}'
+#ACCEPTED_OUT = json.dumps({'tx_status': 'ACCEPTED_ON_L2'})
+#ACCEPTED_OUT = b'{"tx_status": "ACCEPTED_ON_L2"}'
+REJECTED_OUT = json.dumps({'tx_failure_reason': {'error_message': 'E'}, 'tx_status': 'REJECTED'})
+#REJECTED_OUT = json.dumps({'tx_failure_reason': {'error_message': 'E'}, 'tx_status': 'REJECTED'})
+#REJECTED_OUT = b'{"tx_failure_reason": {"error_message": "E"}, "tx_status": "REJECTED"}'
 
 
 @pytest.fixture(autouse=True)
@@ -74,11 +79,11 @@ def test__locate_error_lines_with_abis_misformatted_line(mock_path, caplog):
     reason="Issue in cairo-lang. "
     "See https://github.com/starkware-libs/cairo-lang/issues/27",
 )
-@patch("nile.utils.debug.capture_stdout")
-async def test_debug_feedback_with_message(mock_output, output, expected, caplog):
+async def test_debug_feedback_with_message(output, expected, caplog):
     logging.getLogger().setLevel(logging.INFO)
-    mock_output.return_value = output
+    with patch("nile.utils.debug.call_cli", new=AsyncMock()) as mock_cli_call:
+        mock_cli_call.return_value = output
 
-    await debug(MOCK_HASH, NETWORK)
+        await debug(MOCK_HASH, NETWORK)
 
-    assert expected in caplog.text
+        assert expected in caplog.text
diff --git a/tests/commands/test_declare.py b/tests/commands/test_declare.py
index 8e6b9618..a04e1410 100644
--- a/tests/commands/test_declare.py
+++ b/tests/commands/test_declare.py
@@ -1,6 +1,6 @@
 """Tests for declare command."""
 import logging
-from unittest.mock import patch
+from unittest.mock import patch, AsyncMock
 
 import pytest
 
@@ -23,7 +23,7 @@ def tmp_working_dir(monkeypatch, tmp_path):
 PATH = (BUILD_DIRECTORY, ABIS_DIRECTORY)
 OVERRIDING_PATH = ("new_path", ABIS_DIRECTORY)
 MAX_FEE = "432"
-RUN_OUTPUT = b"output"
+CALL_OUTPUT = b"output"
 HASH = 111
 TX_HASH = 222
 
@@ -47,12 +47,12 @@ def test_alias_exists():
             [  # expected command
                 "--contract",
                 f"{PATH[0]}/{CONTRACT}.json",
-                "--sender",
-                hex_address(SENDER),
-                "--max_fee",
-                "0",
                 "--signature",
                 *SIGNATURE,
+                "--max_fee",
+                "0",
+                "--sender",
+                hex_address(SENDER),
             ],
             [HASH, NETWORK, None],  # expected register
         ),
@@ -61,12 +61,12 @@ def test_alias_exists():
             [  # expected command
                 "--contract",
                 f"{PATH[0]}/{CONTRACT}.json",
-                "--sender",
-                hex_address(SENDER),
-                "--max_fee",
-                "0",
                 "--signature",
                 *SIGNATURE,
+                "--max_fee",
+                "0",
+                "--sender",
+                hex_address(SENDER),
             ],
             [HASH, NETWORK, ALIAS],  # expected register
         ),
@@ -75,12 +75,12 @@ def test_alias_exists():
             [  # expected command
                 "--contract",
                 f"{OVERRIDING_PATH[0]}/{CONTRACT}.json",
-                "--sender",
-                hex_address(SENDER),
-                "--max_fee",
-                "0",
                 "--signature",
                 *SIGNATURE,
+                "--max_fee",
+                "0",
+                "--sender",
+                hex_address(SENDER),
             ],
             [HASH, NETWORK, ALIAS],  # expected register
         ),
@@ -89,50 +89,47 @@ def test_alias_exists():
             [  # expected command
                 "--contract",
                 f"{PATH[0]}/{CONTRACT}.json",
-                "--sender",
-                hex_address(SENDER),
-                "--max_fee",
-                MAX_FEE,
                 "--signature",
                 *SIGNATURE,
+                "--max_fee",
+                MAX_FEE,
+                "--sender",
+                hex_address(SENDER),
             ],
             [HASH, NETWORK, ALIAS],  # expected register
         ),
     ],
 )
-@patch("nile.core.declare.starknet_cli.declare")
-@patch("nile.core.declare.capture_stdout", return_value=RUN_OUTPUT)
 @patch("nile.core.declare.parse_information", return_value=[HASH, TX_HASH])
 @patch("nile.core.declare.deployments.register_class_hash")
 async def test_declare(
     mock_register,
     mock_parse,
-    mock_capture,
-    mock_sn_declare,
     caplog,
     args,
     exp_command,
     exp_register,
 ):
     logging.getLogger().setLevel(logging.INFO)
+    with patch("nile.core.declare.call_cli", new=AsyncMock()) as mock_cli_call:
+        mock_cli_call.return_value = CALL_OUTPUT
+        # check return value
+        res = await declare(*args)
+        assert res == HASH
 
-    # check return value
-    res = await declare(*args)
-    assert res == HASH
-
-    # check internals
-    args = set_args(NETWORK)
+        # check internals
+        args = set_args(NETWORK)
 
-    mock_sn_declare.assert_called_once_with(args=args, command_args=exp_command)
-    mock_parse.assert_called_once_with(RUN_OUTPUT)
-    mock_register.assert_called_once_with(*exp_register)
+        mock_cli_call.assert_called_once_with("declare", args, exp_command)
+        mock_parse.assert_called_once_with(CALL_OUTPUT)
+        mock_register.assert_called_once_with(*exp_register)
 
-    # check logs
-    assert f"🚀 Declaring {CONTRACT}" in caplog.text
-    assert (
-        f"⏳ Successfully sent declaration of {CONTRACT} as {hex(HASH)}" in caplog.text
-    )
-    assert f"🧾 Transaction hash: {hex(TX_HASH)}" in caplog.text
+        # check logs
+        assert f"🚀 Declaring {CONTRACT}" in caplog.text
+        assert (
+            f"⏳ Successfully sent declaration of {CONTRACT} as {hex(HASH)}" in caplog.text
+        )
+        assert f"🧾 Transaction hash: {hex(TX_HASH)}" in caplog.text
 
 
 @pytest.mark.asyncio
diff --git a/tests/test_cli.py b/tests/test_cli.py
index e2d64b42..43ffaf2e 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -193,12 +193,12 @@ async def test_node_runs_gateway(opts, expected):
         ([MOCK_HASH, "--network", "mainnet", "--contracts_file", "example.txt"]),
     ],
 )
-@patch("nile.utils.debug.capture_stdout")
+@patch("nile.utils.debug.call_cli")
 @patch("nile.utils.debug.set_args")
 @patch("nile.cli.debug_command")
-async def test_debug(mock_debug, mock_set_args, mock_capture, args):
+async def test_debug(mock_debug, mock_set_args, mock_cli_call, args):
     # debug will hang without patch
-    mock_capture.return_value = json.dumps({"tx_status": "ACCEPTED"})
+    mock_cli_call.return_value = json.dumps({"tx_status": "ACCEPTED"})
 
     result = await CliRunner().invoke(cli, ["debug", *args])
 

From c6e4eae7feee25d35849ee1245e7fe9cc3a49efb Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Sat, 5 Nov 2022 19:10:58 -0400
Subject: [PATCH 053/109] fix tests with call_cli

---
 tests/commands/test_deploy.py    | 38 +++++++++++++++++---------------
 tests/commands/test_get_nonce.py | 20 ++++++++---------
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/tests/commands/test_deploy.py b/tests/commands/test_deploy.py
index d551284c..53d697fb 100644
--- a/tests/commands/test_deploy.py
+++ b/tests/commands/test_deploy.py
@@ -1,6 +1,6 @@
 """Tests for deploy command."""
 import logging
-from unittest.mock import patch
+from unittest.mock import patch, AsyncMock
 
 import pytest
 
@@ -25,7 +25,7 @@ def tmp_working_dir(monkeypatch, tmp_path):
 ARGS = [1, 2, 3]
 ADDRESS = 999
 TX_HASH = 222
-RUN_OUTPUT = [ADDRESS, TX_HASH]
+CALL_OUTPUT = [ADDRESS, TX_HASH]
 
 
 @pytest.mark.asyncio
@@ -50,24 +50,26 @@ def tmp_working_dir(monkeypatch, tmp_path):
         ),
     ],
 )
-@patch("nile.core.deploy.capture_stdout", return_value=RUN_OUTPUT)
-@patch("nile.core.deploy.parse_information", return_value=RUN_OUTPUT)
+@patch("nile.core.deploy.parse_information", return_value=CALL_OUTPUT)
 @patch("nile.core.deploy.deployments.register")
-async def test_deploy(mock_register, mock_parse, mock_capture, caplog, args, exp_abi):
+async def test_deploy(mock_register, mock_parse, caplog, args, exp_abi):
     logging.getLogger().setLevel(logging.INFO)
 
-    # check return values
-    res = await deploy(*args)
-    assert res == (ADDRESS, exp_abi)
+    with patch("nile.core.deploy.call_cli", new=AsyncMock()) as mock_cli_call:
+        mock_cli_call.return_value = CALL_OUTPUT
 
-    # check internals
-    mock_parse.assert_called_once_with(RUN_OUTPUT)
-    mock_register.assert_called_once_with(ADDRESS, exp_abi, NETWORK, ALIAS)
+        # check return values
+        res = await deploy(*args)
+        assert res == (ADDRESS, exp_abi)
 
-    # check logs
-    assert f"🚀 Deploying {CONTRACT}" in caplog.text
-    assert (
-        f"⏳ ️Deployment of {CONTRACT} successfully sent at {hex_address(ADDRESS)}"
-        in caplog.text
-    )
-    assert f"🧾 Transaction hash: {hex(TX_HASH)}" in caplog.text
+        # check internals
+        mock_parse.assert_called_once_with(CALL_OUTPUT)
+        mock_register.assert_called_once_with(ADDRESS, exp_abi, NETWORK, ALIAS)
+
+        # check logs
+        assert f"🚀 Deploying {CONTRACT}" in caplog.text
+        assert (
+            f"⏳ ️Deployment of {CONTRACT} successfully sent at {hex_address(ADDRESS)}"
+            in caplog.text
+        )
+        assert f"🧾 Transaction hash: {hex(TX_HASH)}" in caplog.text
diff --git a/tests/commands/test_get_nonce.py b/tests/commands/test_get_nonce.py
index 1f3634e3..cd79c0ce 100644
--- a/tests/commands/test_get_nonce.py
+++ b/tests/commands/test_get_nonce.py
@@ -1,6 +1,6 @@
 """Tests for get-nonce command."""
 import logging
-from unittest.mock import patch
+from unittest.mock import patch, AsyncMock
 
 import pytest
 
@@ -37,13 +37,11 @@ async def test_get_nonce(mock_without_log, contract_address, network, caplog):
     "contract_address",
     ["0x4d2", "1234", 1234],
 )
-@patch("nile.utils.get_nonce.starknet_cli.get_nonce")
-@patch("nile.utils.get_nonce.capture_stdout", return_value=NONCE)
-async def test_get_nonce_without_log_address_formats(
-    mock_capture, mock_sn_get_nonce, contract_address
-):
-    await get_nonce_without_log(contract_address, "goerli")
-
-    args = set_args("goerli")
-    command = ["--contract_address", "0x4d2"]
-    mock_sn_get_nonce.assert_called_once_with(args=args, command_args=command)
+async def test_get_nonce_without_log_address_formats(contract_address):
+    with patch("nile.utils.get_nonce.call_cli", new=AsyncMock()) as mock_cli_call:
+        mock_cli_call.return_value = NONCE
+        await get_nonce_without_log(contract_address, "goerli")
+
+        args = set_args("goerli")
+        command_args = ["--contract_address", "0x4d2"]
+        mock_cli_call.assert_called_once_with("get_nonce", args, command_args)

From a8209b730ae7991334a8c0561466713520d8c21f Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Sat, 5 Nov 2022 19:17:35 -0400
Subject: [PATCH 054/109] fix formatting

---
 tests/commands/test_debug.py     | 11 +++--------
 tests/commands/test_declare.py   |  5 +++--
 tests/commands/test_deploy.py    |  2 +-
 tests/commands/test_get_nonce.py |  2 +-
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/tests/commands/test_debug.py b/tests/commands/test_debug.py
index 95bfab4e..97b824bb 100644
--- a/tests/commands/test_debug.py
+++ b/tests/commands/test_debug.py
@@ -2,8 +2,7 @@
 import logging
 import sys
 from pathlib import Path
-from unittest.mock import patch, AsyncMock
-import json
+from unittest.mock import AsyncMock, patch
 
 import pytest
 
@@ -16,12 +15,8 @@
 ABI_PATH = "path/to/abis/test_contract.json"
 ALIAS = "contract_alias"
 MOCK_FILE = 123
-ACCEPTED_OUT = b'{"tx_status": "ACCEPTED_ON_L2"}'
-#ACCEPTED_OUT = json.dumps({'tx_status': 'ACCEPTED_ON_L2'})
-#ACCEPTED_OUT = b'{"tx_status": "ACCEPTED_ON_L2"}'
-REJECTED_OUT = json.dumps({'tx_failure_reason': {'error_message': 'E'}, 'tx_status': 'REJECTED'})
-#REJECTED_OUT = json.dumps({'tx_failure_reason': {'error_message': 'E'}, 'tx_status': 'REJECTED'})
-#REJECTED_OUT = b'{"tx_failure_reason": {"error_message": "E"}, "tx_status": "REJECTED"}'
+ACCEPTED_OUT = '{"tx_status": "ACCEPTED_ON_L2"}'
+REJECTED_OUT = '{"tx_failure_reason": {"error_message": "E"}, "tx_status": "REJECTED"}'
 
 
 @pytest.fixture(autouse=True)
diff --git a/tests/commands/test_declare.py b/tests/commands/test_declare.py
index a04e1410..70bb4943 100644
--- a/tests/commands/test_declare.py
+++ b/tests/commands/test_declare.py
@@ -1,6 +1,6 @@
 """Tests for declare command."""
 import logging
-from unittest.mock import patch, AsyncMock
+from unittest.mock import AsyncMock, patch
 
 import pytest
 
@@ -127,7 +127,8 @@ async def test_declare(
         # check logs
         assert f"🚀 Declaring {CONTRACT}" in caplog.text
         assert (
-            f"⏳ Successfully sent declaration of {CONTRACT} as {hex(HASH)}" in caplog.text
+            f"⏳ Successfully sent declaration of {CONTRACT} as {hex(HASH)}"
+            in caplog.text
         )
         assert f"🧾 Transaction hash: {hex(TX_HASH)}" in caplog.text
 
diff --git a/tests/commands/test_deploy.py b/tests/commands/test_deploy.py
index 53d697fb..112ffaa7 100644
--- a/tests/commands/test_deploy.py
+++ b/tests/commands/test_deploy.py
@@ -1,6 +1,6 @@
 """Tests for deploy command."""
 import logging
-from unittest.mock import patch, AsyncMock
+from unittest.mock import AsyncMock, patch
 
 import pytest
 
diff --git a/tests/commands/test_get_nonce.py b/tests/commands/test_get_nonce.py
index cd79c0ce..b02d8e95 100644
--- a/tests/commands/test_get_nonce.py
+++ b/tests/commands/test_get_nonce.py
@@ -1,6 +1,6 @@
 """Tests for get-nonce command."""
 import logging
-from unittest.mock import patch, AsyncMock
+from unittest.mock import AsyncMock, patch
 
 import pytest
 

From ae6250207c71accc21acdeeb04e879962c83d37f Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Wed, 9 Nov 2022 17:44:02 -0500
Subject: [PATCH 055/109] remove unnecessary hex

---
 src/nile/deployments.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/nile/deployments.py b/src/nile/deployments.py
index 0e62ebc9..b75571e9 100644
--- a/src/nile/deployments.py
+++ b/src/nile/deployments.py
@@ -81,8 +81,6 @@ def register_class_hash(hash, network, alias):
         raise Exception(f"Hash {hash[:6]}...{hash[-6:]} already exists in {file}")
 
     with open(file, "a") as fp:
-        # Save class_hash as hex
-        hash = hex(hash)
         if alias is not None:
             logging.info(f"📦 Registering {alias} in {file}")
         else:

From 67f8f0bb736ef21a2d88018758942bdab564ab8a Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Wed, 9 Nov 2022 19:49:32 -0500
Subject: [PATCH 056/109] remove async from simulate methods

---
 src/nile/core/account.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/nile/core/account.py b/src/nile/core/account.py
index 396393f8..370bf1a3 100644
--- a/src/nile/core/account.py
+++ b/src/nile/core/account.py
@@ -188,19 +188,19 @@ async def send(
             query_flag=query_type,
         )
 
-    async def simulate(
+    def simulate(
         self, address_or_alias, method, calldata, max_fee=None, nonce=None
     ):
         """Simulate a tx going through an Account contract."""
-        return await self.send(
+        return self.send(
             address_or_alias, method, calldata, max_fee, nonce, "simulate"
         )
 
-    async def estimate_fee(
+    def estimate_fee(
         self, address_or_alias, method, calldata, max_fee=None, nonce=None
     ):
         """Estimate fee for a tx going through an Account contract."""
-        return await self.send(
+        return self.send(
             address_or_alias, method, calldata, max_fee, nonce, "estimate_fee"
         )
 

From f57df83a65e1680943f772a5a8a61646b578821c Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Wed, 9 Nov 2022 19:52:20 -0500
Subject: [PATCH 057/109] remove unnecessary int conversion

---
 src/nile/core/account.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/nile/core/account.py b/src/nile/core/account.py
index 370bf1a3..f9e660bb 100644
--- a/src/nile/core/account.py
+++ b/src/nile/core/account.py
@@ -109,7 +109,7 @@ async def declare(
     ):
         """Declare a contract through an Account contract."""
         if nonce is None:
-            nonce = int(await get_nonce(self.address, self.network))
+            nonce = await get_nonce(self.address, self.network)
 
         if max_fee is None:
             max_fee = 0

From 8a5bac0cc11d8ea2135ccffb68341d73e121db25 Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Wed, 9 Nov 2022 19:58:21 -0500
Subject: [PATCH 058/109] add comment regarding AsyncObject in Account

---
 src/nile/core/account.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/nile/core/account.py b/src/nile/core/account.py
index f9e660bb..e0f1c0cb 100644
--- a/src/nile/core/account.py
+++ b/src/nile/core/account.py
@@ -41,7 +41,11 @@ async def __init__(self):
 
 
 class Account(AsyncObject):
-    """Account contract abstraction."""
+    """
+    Account contract abstraction.
+
+    Remove AsyncObject if Account.deploy decouples from initialization.
+    """
 
     async def __init__(self, signer, network, predeployed_info=None):
         """Get or deploy an Account contract for the given private key."""
@@ -188,13 +192,9 @@ async def send(
             query_flag=query_type,
         )
 
-    def simulate(
-        self, address_or_alias, method, calldata, max_fee=None, nonce=None
-    ):
+    def simulate(self, address_or_alias, method, calldata, max_fee=None, nonce=None):
         """Simulate a tx going through an Account contract."""
-        return self.send(
-            address_or_alias, method, calldata, max_fee, nonce, "simulate"
-        )
+        return self.send(address_or_alias, method, calldata, max_fee, nonce, "simulate")
 
     def estimate_fee(
         self, address_or_alias, method, calldata, max_fee=None, nonce=None

From b7f2dd801e67a4a4f15c44bc7a400a142c3c86c5 Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Wed, 9 Nov 2022 20:24:56 -0500
Subject: [PATCH 059/109] handle async logging

---
 src/nile/cli.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/nile/cli.py b/src/nile/cli.py
index 2133be8f..c2bd4158 100644
--- a/src/nile/cli.py
+++ b/src/nile/cli.py
@@ -25,6 +25,7 @@
 from nile.utils.get_nonce import get_nonce as get_nonce_command
 
 logging.basicConfig(level=logging.DEBUG, format="%(message)s")
+logging.getLogger('asyncio').setLevel(logging.WARNING)
 
 NETWORKS = ("localhost", "integration", "goerli", "goerli2", "mainnet")
 

From ab025311fb33f33cbb9f55463a6c93ea18af32f5 Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Wed, 9 Nov 2022 20:57:59 -0500
Subject: [PATCH 060/109] fix formatting

---
 src/nile/cli.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/nile/cli.py b/src/nile/cli.py
index c2bd4158..471dc201 100644
--- a/src/nile/cli.py
+++ b/src/nile/cli.py
@@ -25,7 +25,7 @@
 from nile.utils.get_nonce import get_nonce as get_nonce_command
 
 logging.basicConfig(level=logging.DEBUG, format="%(message)s")
-logging.getLogger('asyncio').setLevel(logging.WARNING)
+logging.getLogger("asyncio").setLevel(logging.WARNING)
 
 NETWORKS = ("localhost", "integration", "goerli", "goerli2", "mainnet")
 

From 33f4ad00f898dc038c7680278f7cc930b90ae43b Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Thu, 10 Nov 2022 00:40:21 -0500
Subject: [PATCH 061/109] refactor _process_arguments

---
 src/nile/core/account.py | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/nile/core/account.py b/src/nile/core/account.py
index e0f1c0cb..814f4824 100644
--- a/src/nile/core/account.py
+++ b/src/nile/core/account.py
@@ -112,14 +112,9 @@ async def declare(
         mainnet_token=None,
     ):
         """Declare a contract through an Account contract."""
-        if nonce is None:
-            nonce = await get_nonce(self.address, self.network)
-
-        if max_fee is None:
-            max_fee = 0
-        else:
-            max_fee = int(max_fee)
-
+        max_fee, nonce = await self._process_arguments(
+            max_fee, nonce
+        )
         contract_class = get_contract_class(
             contract_name=contract_name, overriding_path=overriding_path
         )
@@ -166,8 +161,8 @@ async def send(
         target_address = self._get_target_address(address_or_alias)
 
         # process and parse arguments
-        calldata, max_fee, nonce = await self._process_arguments(
-            calldata, max_fee, nonce
+        max_fee, nonce, calldata = await self._process_arguments(
+            max_fee, nonce, calldata
         )
 
         # get tx version
@@ -215,9 +210,7 @@ def _get_target_address(self, address_or_alias):
 
         return target_address
 
-    async def _process_arguments(self, calldata, max_fee, nonce):
-        calldata = [normalize_number(x) for x in calldata]
-
+    async def _process_arguments(self, max_fee, nonce, calldata=None):
         if nonce is None:
             nonce = await get_nonce(self.address, self.network)
 
@@ -226,4 +219,8 @@ async def _process_arguments(self, calldata, max_fee, nonce):
         else:
             max_fee = int(max_fee)
 
-        return calldata, max_fee, nonce
+        if calldata is not None:
+            calldata = [normalize_number(x) for x in calldata]
+            return max_fee, nonce, calldata
+
+        return max_fee, nonce

From d674b53671bd60cb239a1596f0eb7eb34050bb25 Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Thu, 10 Nov 2022 00:41:14 -0500
Subject: [PATCH 062/109] fix formatting

---
 src/nile/core/account.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/nile/core/account.py b/src/nile/core/account.py
index 814f4824..03f3b2cd 100644
--- a/src/nile/core/account.py
+++ b/src/nile/core/account.py
@@ -112,9 +112,8 @@ async def declare(
         mainnet_token=None,
     ):
         """Declare a contract through an Account contract."""
-        max_fee, nonce = await self._process_arguments(
-            max_fee, nonce
-        )
+        max_fee, nonce = await self._process_arguments(max_fee, nonce)
+
         contract_class = get_contract_class(
             contract_name=contract_name, overriding_path=overriding_path
         )

From eb1690106ac1180d99f4f51269a2af82c375cd95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Triay?= <martriay@gmail.com>
Date: Sat, 12 Nov 2022 02:10:05 -0300
Subject: [PATCH 063/109] test account.deploy

---
 src/nile/core/account.py       | 10 +++--
 tests/commands/test_account.py | 82 ++++++++++++++++++++--------------
 2 files changed, 56 insertions(+), 36 deletions(-)

diff --git a/src/nile/core/account.py b/src/nile/core/account.py
index 78635cdc..507958da 100644
--- a/src/nile/core/account.py
+++ b/src/nile/core/account.py
@@ -97,10 +97,12 @@ async def deploy(
         class_hash = get_hash("Account")
         calldata = [self.signer.public_key]
 
+        calldata, max_fee, nonce = await self._process_arguments(calldata, max_fee, nonce)
+
         contract_address = calculate_contract_address_from_hash(
             salt=salt,
             class_hash=class_hash,
-            calldata=calldata,
+            constructor_calldata=calldata,
             deployer_address=0,
         )
 
@@ -108,7 +110,7 @@ async def deploy(
             contract_address, class_hash, calldata, salt, max_fee, nonce
         )
 
-        address, _ = deploy_account(
+        address, _ = await deploy_account(
             network=self.network,
             salt=salt,
             calldata=calldata,
@@ -245,7 +247,9 @@ def _get_target_address(self, address_or_alias):
     async def _process_arguments(self, calldata, max_fee, nonce):
         calldata = [normalize_number(x) for x in calldata]
 
-        if nonce is None:
+        if not hasattr(self, "address"):
+            nonce = 0
+        elif nonce is None:
             nonce = await get_nonce(self.address, self.network)
 
         if max_fee is None:
diff --git a/tests/commands/test_account.py b/tests/commands/test_account.py
index 0e90077e..f3bb4623 100644
--- a/tests/commands/test_account.py
+++ b/tests/commands/test_account.py
@@ -18,6 +18,8 @@
 MOCK_TARGET_ADDRESS = 0x987
 MOCK_INDEX = 0
 MAX_FEE = 10
+SIGNATURE = [111, 222]
+CLASS_HASH = 12345
 
 
 @pytest.fixture(autouse=True)
@@ -49,32 +51,39 @@ async def test_account_init_bad_key(caplog):
 
 
 @pytest.mark.asyncio
-@patch("nile.core.account.deploy", return_value=(1, 2))
+@patch("nile.core.account.deploy_account", return_value=(1, 2))
+@patch("nile.core.account.get_hash", return_value=CLASS_HASH)
+@patch("nile.core.account.Signer.sign_deployment", return_value=SIGNATURE)
 @patch("nile.core.account.os.path.dirname")
-async def test_deploy(mock_path, mock_deploy):
+async def test_deploy(mock_path, mock_signer, mock_hash, mock_deploy):
     test_path = "/overriding_path"
+    overriding_path = (
+        f"{test_path}/artifacts",
+        f"{test_path}/artifacts/abis",
+    )
+
     mock_path.return_value.replace.return_value = test_path
 
     account = await Account(KEY, NETWORK)
+    calldata = [account.signer.public_key]
 
-    expected = [
-        "Account",  # contract
-        [account.signer.public_key],  # arguments
-        NETWORK,  # network
-        f"account-{account.index}",  # alias
-        (
-            f"{test_path}/artifacts",  # overriding-
-            f"{test_path}/artifacts/abis",  # path
-        ),
-    ]
-
-    mock_deploy.assert_called_with(*expected)
+    mock_deploy.assert_called_with(
+        network=NETWORK,
+        salt=0,
+        calldata=calldata,
+        signature=SIGNATURE,
+        max_fee=0,
+        nonce=0,
+        query_type=None,
+        overriding_path=overriding_path
+    )
 
 
 @pytest.mark.asyncio
-@patch("nile.core.account.deploy", return_value=(MOCK_ADDRESS, MOCK_INDEX))
+@patch("nile.core.account.deploy_account", return_value=(MOCK_ADDRESS, MOCK_INDEX))
+@patch("nile.core.account.get_hash", return_value=CLASS_HASH)
 @patch("nile.core.account.accounts.register")
-async def test_deploy_accounts_register(mock_register, mock_deploy):
+async def test_deploy_accounts_register(mock_register, mock_hash, mock_deploy):
     account = await Account(KEY, NETWORK)
 
     mock_register.assert_called_once_with(
@@ -83,10 +92,11 @@ async def test_deploy_accounts_register(mock_register, mock_deploy):
 
 
 @pytest.mark.asyncio
-@patch("nile.core.account.deploy", return_value=(MOCK_ADDRESS, MOCK_INDEX))
+@patch("nile.core.account.deploy_account", return_value=(MOCK_ADDRESS, MOCK_INDEX))
+@patch("nile.core.account.get_hash", return_value=CLASS_HASH)
 @patch("nile.core.account.get_contract_class", return_value="ContractClass")
 @patch("nile.core.account.declare")
-async def test_declare(mock_declare, mock_get_class, mock_deploy):
+async def test_declare(mock_declare, mock_get_class, mock_hash, mock_deploy):
     account = await Account(KEY, NETWORK)
 
     signature = [999, 888]
@@ -132,13 +142,14 @@ async def test_declare(mock_declare, mock_get_class, mock_deploy):
 
 
 @pytest.mark.asyncio
-@patch("nile.core.account.deploy", return_value=(MOCK_ADDRESS, MOCK_INDEX))
+@patch("nile.core.account.deploy_account", return_value=(MOCK_ADDRESS, MOCK_INDEX))
+@patch("nile.core.account.get_hash", return_value=CLASS_HASH)
 @patch("nile.core.account.get_nonce", return_value=0)
 @patch("nile.core.account.call_or_invoke")
 @patch(
     "nile.core.account.Account._get_target_address", return_value=MOCK_TARGET_ADDRESS
 )
-async def test_send_nonce_call(mock_target_address, mock_call, mock_nonce, mock_deploy):
+async def test_send_nonce_call(mock_target_address, mock_call, mock_nonce, mock_hash, mock_deploy):
     account = await Account(KEY, NETWORK)
 
     await account.send(MOCK_TARGET_ADDRESS, "method", [1, 2, 3], max_fee=1)
@@ -151,15 +162,16 @@ async def test_send_nonce_call(mock_target_address, mock_call, mock_nonce, mock_
 
 
 @pytest.mark.asyncio
-@patch("nile.core.account.deploy", return_value=(MOCK_ADDRESS, MOCK_INDEX))
+@patch("nile.core.account.deploy_account", return_value=(MOCK_ADDRESS, MOCK_INDEX))
+@patch("nile.core.account.get_hash", return_value=CLASS_HASH)
 @patch(
     "nile.core.account.Account._get_target_address", return_value=MOCK_TARGET_ADDRESS
 )
-async def test_send_sign_transaction_and_execute(mock_target_address, mock_deploy):
+async def test_send_sign_transaction_and_execute(mock_target_address, mock_hash, mock_deploy):
     account = await Account(KEY, NETWORK)
 
     calldata = ["111", "222", "333"]
-    sig_r, sig_s = [999, 888]
+    sig_r, sig_s = SIGNATURE
     return_signature = [calldata, sig_r, sig_s]
 
     account.signer.sign_transaction = MagicMock(return_value=return_signature)
@@ -193,18 +205,19 @@ async def test_send_sign_transaction_and_execute(mock_target_address, mock_deplo
 
 
 @pytest.mark.asyncio
-@patch("nile.core.account.deploy", return_value=(MOCK_ADDRESS, MOCK_INDEX))
+@patch("nile.core.account.deploy_account", return_value=(MOCK_ADDRESS, MOCK_INDEX))
+@patch("nile.core.account.get_hash", return_value=CLASS_HASH)
 @patch(
     "nile.core.account.Account._get_target_address", return_value=MOCK_TARGET_ADDRESS
 )
 @patch("nile.core.account.get_nonce", return_value=0)
 @patch("nile.core.account.call_or_invoke")
-async def test_send_defaults(mock_call, mock_nonce, mock_target_address, mock_deploy):
+async def test_send_defaults(mock_call, mock_nonce, mock_target_address, mock_hash, mock_deploy):
     account = await Account(KEY, NETWORK)
 
     send_args = [MOCK_TARGET_ADDRESS, "method", [1, 2, 3]]
     calldata = ["111", "222", "333"]
-    sig_r, sig_s = [999, 888]
+    sig_r, sig_s = SIGNATURE
     return_signature = [calldata, sig_r, sig_s]
 
     # Mock sign_transaction
@@ -233,8 +246,9 @@ async def test_send_defaults(mock_call, mock_nonce, mock_target_address, mock_de
 
 
 @pytest.mark.asyncio
-@patch("nile.core.account.deploy", return_value=(MOCK_ADDRESS, MOCK_INDEX))
-async def test_estimate_fee(mock_deploy):
+@patch("nile.core.account.deploy_account", return_value=(MOCK_ADDRESS, MOCK_INDEX))
+@patch("nile.core.account.get_hash", return_value=CLASS_HASH)
+async def test_estimate_fee(mock_hash, mock_deploy):
     account = await Account(KEY, NETWORK)
     # Mock send
     account.send = AsyncMock()
@@ -247,8 +261,9 @@ async def test_estimate_fee(mock_deploy):
 
 
 @pytest.mark.asyncio
-@patch("nile.core.account.deploy", return_value=(MOCK_ADDRESS, MOCK_INDEX))
-async def test_simulate(mock_deploy):
+@patch("nile.core.account.deploy_account", return_value=(MOCK_ADDRESS, MOCK_INDEX))
+@patch("nile.core.account.get_hash", return_value=CLASS_HASH)
+async def test_simulate(mock_hash, mock_deploy):
     account = await Account(KEY, NETWORK)
     # Mock send
     account.send = AsyncMock()
@@ -262,20 +277,21 @@ async def test_simulate(mock_deploy):
 
 @pytest.mark.asyncio
 @pytest.mark.parametrize("query_type", ["estimate_fee", "simulate"])
-@patch("nile.core.account.deploy", return_value=(MOCK_ADDRESS, MOCK_INDEX))
+@patch("nile.core.account.deploy_account", return_value=(MOCK_ADDRESS, MOCK_INDEX))
+@patch("nile.core.account.get_hash", return_value=CLASS_HASH)
 @patch(
     "nile.core.account.Account._get_target_address", return_value=MOCK_TARGET_ADDRESS
 )
 @patch("nile.core.account.get_nonce", return_value=0)
 @patch("nile.core.account.call_or_invoke")
 async def test_execute_query(
-    mock_call, mock_nonce, mock_target_address, mock_deploy, query_type
+    mock_call, mock_nonce, mock_target_address, mock_hash, mock_deploy, query_type
 ):
     account = await Account(KEY, NETWORK)
 
     send_args = [MOCK_TARGET_ADDRESS, "method", [1, 2, 3]]
     calldata = ["111", "222", "333"]
-    sig_r, sig_s = [999, 888]
+    sig_r, sig_s = SIGNATURE
     return_signature = [calldata, sig_r, sig_s]
 
     # Mock sign_transaction

From 14e4d757d277128b8ae59b692258931a223de425 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Triay?= <martriay@gmail.com>
Date: Sat, 12 Nov 2022 02:24:56 -0300
Subject: [PATCH 064/109] test deploy_account

---
 tests/commands/test_deploy.py | 50 ++++++++++++++++++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

diff --git a/tests/commands/test_deploy.py b/tests/commands/test_deploy.py
index d551284c..e24c79be 100644
--- a/tests/commands/test_deploy.py
+++ b/tests/commands/test_deploy.py
@@ -5,7 +5,7 @@
 import pytest
 
 from nile.common import ABIS_DIRECTORY, BUILD_DIRECTORY
-from nile.core.deploy import deploy
+from nile.core.deploy import deploy, deploy_account
 from nile.utils import hex_address
 
 
@@ -22,9 +22,14 @@ def tmp_working_dir(monkeypatch, tmp_path):
 ABI_OVERRIDE = f"{ABIS_DIRECTORY}/override.json"
 BASE_PATH = (BUILD_DIRECTORY, ABIS_DIRECTORY)
 PATH_OVERRIDE = ("artifacts2", ABIS_DIRECTORY)
+CLASS_HASH = 1231
 ARGS = [1, 2, 3]
 ADDRESS = 999
 TX_HASH = 222
+SALT = 555
+SIGNATURE = [111, 333]
+FEE = 666
+NONCE = 34
 RUN_OUTPUT = [ADDRESS, TX_HASH]
 
 
@@ -71,3 +76,46 @@ async def test_deploy(mock_register, mock_parse, mock_capture, caplog, args, exp
         in caplog.text
     )
     assert f"🧾 Transaction hash: {hex(TX_HASH)}" in caplog.text
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "args, exp_abi",
+    [
+        (
+            [NETWORK, SALT, ARGS, SIGNATURE, CONTRACT, FEE, NONCE, None, None, ALIAS],  # args
+            ABI,  # expected ABI
+        ),
+        (
+            [NETWORK, SALT, ARGS, SIGNATURE, CONTRACT, FEE, NONCE, None, PATH_OVERRIDE, ALIAS],  # args
+            ABI,  # expected ABI
+        ),
+        (
+            [NETWORK, SALT, ARGS, SIGNATURE, CONTRACT, FEE, NONCE, ABI_OVERRIDE, None, ALIAS],  # args
+            ABI_OVERRIDE,  # expected ABI
+        ),
+        (
+            [NETWORK, SALT, ARGS, SIGNATURE, CONTRACT, FEE, NONCE, ABI_OVERRIDE, PATH_OVERRIDE, ALIAS],  # args
+            ABI_OVERRIDE,  # expected ABI
+        ),
+    ],
+)
+@patch("nile.core.deploy.deployments.register")
+@patch("nile.core.deploy.get_gateway_response", return_value={"address": ADDRESS, "tx_hash": TX_HASH})
+@patch("nile.core.deploy.get_hash", return_value=CLASS_HASH)
+async def test_deploy_account(mock_hash, mock_gateway, mock_register, caplog, args, exp_abi):
+    logging.getLogger().setLevel(logging.INFO)
+
+    # check return values
+    res = await deploy_account(*args)
+    assert res == (ADDRESS, exp_abi)
+
+    # check internals
+    mock_register.assert_called_once_with(ADDRESS, exp_abi, NETWORK, ALIAS)
+
+    # check logs
+    assert f"🚀 Deploying {CONTRACT}" in caplog.text
+    assert (
+        f"⏳ ️Deployment of {CONTRACT} successfully sent at {hex_address(ADDRESS)}"
+        in caplog.text
+    )
+    assert f"🧾 Transaction hash: {hex(TX_HASH)}" in caplog.text

From 3f82196ed17f5687f9a5a11ee0e511c117ad4c7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Triay?= <martriay@gmail.com>
Date: Sat, 12 Nov 2022 02:26:06 -0300
Subject: [PATCH 065/109] fix linting

---
 src/nile/core/account.py       |  4 ++-
 tests/commands/test_account.py | 14 +++++---
 tests/commands/test_deploy.py  | 62 ++++++++++++++++++++++++++++++----
 3 files changed, 69 insertions(+), 11 deletions(-)

diff --git a/src/nile/core/account.py b/src/nile/core/account.py
index 507958da..70cf02b6 100644
--- a/src/nile/core/account.py
+++ b/src/nile/core/account.py
@@ -97,7 +97,9 @@ async def deploy(
         class_hash = get_hash("Account")
         calldata = [self.signer.public_key]
 
-        calldata, max_fee, nonce = await self._process_arguments(calldata, max_fee, nonce)
+        calldata, max_fee, nonce = await self._process_arguments(
+            calldata, max_fee, nonce
+        )
 
         contract_address = calculate_contract_address_from_hash(
             salt=salt,
diff --git a/tests/commands/test_account.py b/tests/commands/test_account.py
index f3bb4623..ce1d282d 100644
--- a/tests/commands/test_account.py
+++ b/tests/commands/test_account.py
@@ -75,7 +75,7 @@ async def test_deploy(mock_path, mock_signer, mock_hash, mock_deploy):
         max_fee=0,
         nonce=0,
         query_type=None,
-        overriding_path=overriding_path
+        overriding_path=overriding_path,
     )
 
 
@@ -149,7 +149,9 @@ async def test_declare(mock_declare, mock_get_class, mock_hash, mock_deploy):
 @patch(
     "nile.core.account.Account._get_target_address", return_value=MOCK_TARGET_ADDRESS
 )
-async def test_send_nonce_call(mock_target_address, mock_call, mock_nonce, mock_hash, mock_deploy):
+async def test_send_nonce_call(
+    mock_target_address, mock_call, mock_nonce, mock_hash, mock_deploy
+):
     account = await Account(KEY, NETWORK)
 
     await account.send(MOCK_TARGET_ADDRESS, "method", [1, 2, 3], max_fee=1)
@@ -167,7 +169,9 @@ async def test_send_nonce_call(mock_target_address, mock_call, mock_nonce, mock_
 @patch(
     "nile.core.account.Account._get_target_address", return_value=MOCK_TARGET_ADDRESS
 )
-async def test_send_sign_transaction_and_execute(mock_target_address, mock_hash, mock_deploy):
+async def test_send_sign_transaction_and_execute(
+    mock_target_address, mock_hash, mock_deploy
+):
     account = await Account(KEY, NETWORK)
 
     calldata = ["111", "222", "333"]
@@ -212,7 +216,9 @@ async def test_send_sign_transaction_and_execute(mock_target_address, mock_hash,
 )
 @patch("nile.core.account.get_nonce", return_value=0)
 @patch("nile.core.account.call_or_invoke")
-async def test_send_defaults(mock_call, mock_nonce, mock_target_address, mock_hash, mock_deploy):
+async def test_send_defaults(
+    mock_call, mock_nonce, mock_target_address, mock_hash, mock_deploy
+):
     account = await Account(KEY, NETWORK)
 
     send_args = [MOCK_TARGET_ADDRESS, "method", [1, 2, 3]]
diff --git a/tests/commands/test_deploy.py b/tests/commands/test_deploy.py
index e24c79be..ec8b09c9 100644
--- a/tests/commands/test_deploy.py
+++ b/tests/commands/test_deploy.py
@@ -77,32 +77,82 @@ async def test_deploy(mock_register, mock_parse, mock_capture, caplog, args, exp
     )
     assert f"🧾 Transaction hash: {hex(TX_HASH)}" in caplog.text
 
+
 @pytest.mark.asyncio
 @pytest.mark.parametrize(
     "args, exp_abi",
     [
         (
-            [NETWORK, SALT, ARGS, SIGNATURE, CONTRACT, FEE, NONCE, None, None, ALIAS],  # args
+            [
+                NETWORK,
+                SALT,
+                ARGS,
+                SIGNATURE,
+                CONTRACT,
+                FEE,
+                NONCE,
+                None,
+                None,
+                ALIAS,
+            ],  # args
             ABI,  # expected ABI
         ),
         (
-            [NETWORK, SALT, ARGS, SIGNATURE, CONTRACT, FEE, NONCE, None, PATH_OVERRIDE, ALIAS],  # args
+            [
+                NETWORK,
+                SALT,
+                ARGS,
+                SIGNATURE,
+                CONTRACT,
+                FEE,
+                NONCE,
+                None,
+                PATH_OVERRIDE,
+                ALIAS,
+            ],  # args
             ABI,  # expected ABI
         ),
         (
-            [NETWORK, SALT, ARGS, SIGNATURE, CONTRACT, FEE, NONCE, ABI_OVERRIDE, None, ALIAS],  # args
+            [
+                NETWORK,
+                SALT,
+                ARGS,
+                SIGNATURE,
+                CONTRACT,
+                FEE,
+                NONCE,
+                ABI_OVERRIDE,
+                None,
+                ALIAS,
+            ],  # args
             ABI_OVERRIDE,  # expected ABI
         ),
         (
-            [NETWORK, SALT, ARGS, SIGNATURE, CONTRACT, FEE, NONCE, ABI_OVERRIDE, PATH_OVERRIDE, ALIAS],  # args
+            [
+                NETWORK,
+                SALT,
+                ARGS,
+                SIGNATURE,
+                CONTRACT,
+                FEE,
+                NONCE,
+                ABI_OVERRIDE,
+                PATH_OVERRIDE,
+                ALIAS,
+            ],  # args
             ABI_OVERRIDE,  # expected ABI
         ),
     ],
 )
 @patch("nile.core.deploy.deployments.register")
-@patch("nile.core.deploy.get_gateway_response", return_value={"address": ADDRESS, "tx_hash": TX_HASH})
+@patch(
+    "nile.core.deploy.get_gateway_response",
+    return_value={"address": ADDRESS, "tx_hash": TX_HASH},
+)
 @patch("nile.core.deploy.get_hash", return_value=CLASS_HASH)
-async def test_deploy_account(mock_hash, mock_gateway, mock_register, caplog, args, exp_abi):
+async def test_deploy_account(
+    mock_hash, mock_gateway, mock_register, caplog, args, exp_abi
+):
     logging.getLogger().setLevel(logging.INFO)
 
     # check return values

From 743a3837cfffe9b0105de4e358503aac67d4b53e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Triay?= <martriay@gmail.com>
Date: Sat, 12 Nov 2022 02:42:27 -0300
Subject: [PATCH 066/109] add salt and max_fee to Account constructor

---
 src/nile/cli.py                |  6 ++++--
 src/nile/core/account.py       | 13 +++++--------
 src/nile/core/deploy.py        |  3 +--
 tests/commands/test_account.py |  8 ++++----
 tests/commands/test_deploy.py  |  5 -----
 5 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/src/nile/cli.py b/src/nile/cli.py
index 2133be8f..435ae4f2 100644
--- a/src/nile/cli.py
+++ b/src/nile/cli.py
@@ -127,10 +127,12 @@ async def declare(
 
 @cli.command()
 @click.argument("signer", nargs=1)
+@click.option("--salt", nargs=1)
+@click.option("--max_fee", nargs=1)
 @network_option
-async def setup(signer, network):
+async def setup(signer, network, salt=0, max_fee=None):
     """Set up an Account contract."""
-    await Account(signer, network)
+    await Account(signer, network, salt=salt, max_fee=max_fee)
 
 
 @cli.command()
diff --git a/src/nile/core/account.py b/src/nile/core/account.py
index 70cf02b6..5f303d60 100644
--- a/src/nile/core/account.py
+++ b/src/nile/core/account.py
@@ -47,7 +47,7 @@ async def __init__(self):
 class Account(AsyncObject):
     """Account contract abstraction."""
 
-    async def __init__(self, signer, network, predeployed_info=None):
+    async def __init__(self, signer, network, salt=0, max_fee=None, predeployed_info=None):
         """Get or deploy an Account contract for the given private key."""
         try:
             if predeployed_info is None:
@@ -78,7 +78,7 @@ async def __init__(self, signer, network, predeployed_info=None):
             self.address = signer_data["address"]
             self.index = signer_data["index"]
         else:
-            address, index = await self.deploy()
+            address, index = await self.deploy(salt=salt, max_fee=max_fee)
             self.address = address
             self.index = index
 
@@ -86,7 +86,6 @@ async def deploy(
         self,
         salt=0,
         max_fee=None,
-        nonce=None,
         query_type=None,
     ):
         """Deploy an Account contract for the given private key."""
@@ -97,9 +96,8 @@ async def deploy(
         class_hash = get_hash("Account")
         calldata = [self.signer.public_key]
 
-        calldata, max_fee, nonce = await self._process_arguments(
-            calldata, max_fee, nonce
-        )
+        if max_fee is None:
+            max_fee = 0
 
         contract_address = calculate_contract_address_from_hash(
             salt=salt,
@@ -109,7 +107,7 @@ async def deploy(
         )
 
         signature = self.signer.sign_deployment(
-            contract_address, class_hash, calldata, salt, max_fee, nonce
+            contract_address, class_hash, calldata, salt, max_fee, 0 # nonce starts at 0
         )
 
         address, _ = await deploy_account(
@@ -118,7 +116,6 @@ async def deploy(
             calldata=calldata,
             signature=signature,
             max_fee=max_fee,
-            nonce=nonce,
             query_type=query_type,
             overriding_path=overriding_path,
         )
diff --git a/src/nile/core/deploy.py b/src/nile/core/deploy.py
index 9e929c5d..4fcc27cf 100644
--- a/src/nile/core/deploy.py
+++ b/src/nile/core/deploy.py
@@ -71,7 +71,6 @@ async def deploy_account(
     signature,
     contract_name="Account",
     max_fee=None,
-    nonce=0,
     abi=None,
     overriding_path=None,
     alias=None,
@@ -94,7 +93,7 @@ async def deploy_account(
         constructor_calldata=calldata,
         contract_address_salt=salt,
         max_fee=max_fee,
-        nonce=nonce,
+        nonce=0,
         signature=signature,
         version=tx_version,
     )
diff --git a/tests/commands/test_account.py b/tests/commands/test_account.py
index ce1d282d..08cc6bcc 100644
--- a/tests/commands/test_account.py
+++ b/tests/commands/test_account.py
@@ -18,6 +18,7 @@
 MOCK_TARGET_ADDRESS = 0x987
 MOCK_INDEX = 0
 MAX_FEE = 10
+SALT = 444
 SIGNATURE = [111, 222]
 CLASS_HASH = 12345
 
@@ -64,16 +65,15 @@ async def test_deploy(mock_path, mock_signer, mock_hash, mock_deploy):
 
     mock_path.return_value.replace.return_value = test_path
 
-    account = await Account(KEY, NETWORK)
+    account = await Account(KEY, NETWORK, salt=SALT, max_fee=MAX_FEE)
     calldata = [account.signer.public_key]
 
     mock_deploy.assert_called_with(
         network=NETWORK,
-        salt=0,
+        salt=SALT,
         calldata=calldata,
         signature=SIGNATURE,
-        max_fee=0,
-        nonce=0,
+        max_fee=MAX_FEE,
         query_type=None,
         overriding_path=overriding_path,
     )
diff --git a/tests/commands/test_deploy.py b/tests/commands/test_deploy.py
index ec8b09c9..2f27401f 100644
--- a/tests/commands/test_deploy.py
+++ b/tests/commands/test_deploy.py
@@ -29,7 +29,6 @@ def tmp_working_dir(monkeypatch, tmp_path):
 SALT = 555
 SIGNATURE = [111, 333]
 FEE = 666
-NONCE = 34
 RUN_OUTPUT = [ADDRESS, TX_HASH]
 
 
@@ -90,7 +89,6 @@ async def test_deploy(mock_register, mock_parse, mock_capture, caplog, args, exp
                 SIGNATURE,
                 CONTRACT,
                 FEE,
-                NONCE,
                 None,
                 None,
                 ALIAS,
@@ -105,7 +103,6 @@ async def test_deploy(mock_register, mock_parse, mock_capture, caplog, args, exp
                 SIGNATURE,
                 CONTRACT,
                 FEE,
-                NONCE,
                 None,
                 PATH_OVERRIDE,
                 ALIAS,
@@ -120,7 +117,6 @@ async def test_deploy(mock_register, mock_parse, mock_capture, caplog, args, exp
                 SIGNATURE,
                 CONTRACT,
                 FEE,
-                NONCE,
                 ABI_OVERRIDE,
                 None,
                 ALIAS,
@@ -135,7 +131,6 @@ async def test_deploy(mock_register, mock_parse, mock_capture, caplog, args, exp
                 SIGNATURE,
                 CONTRACT,
                 FEE,
-                NONCE,
                 ABI_OVERRIDE,
                 PATH_OVERRIDE,
                 ALIAS,

From 0c5ce88a38d598d03905b7e4e2719f97903d7ab3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Triay?= <martriay@gmail.com>
Date: Sat, 12 Nov 2022 02:43:12 -0300
Subject: [PATCH 067/109] fix linting

---
 src/nile/core/account.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/nile/core/account.py b/src/nile/core/account.py
index 5f303d60..3c04652d 100644
--- a/src/nile/core/account.py
+++ b/src/nile/core/account.py
@@ -47,7 +47,9 @@ async def __init__(self):
 class Account(AsyncObject):
     """Account contract abstraction."""
 
-    async def __init__(self, signer, network, salt=0, max_fee=None, predeployed_info=None):
+    async def __init__(
+        self, signer, network, salt=0, max_fee=None, predeployed_info=None
+    ):
         """Get or deploy an Account contract for the given private key."""
         try:
             if predeployed_info is None:
@@ -107,7 +109,12 @@ async def deploy(
         )
 
         signature = self.signer.sign_deployment(
-            contract_address, class_hash, calldata, salt, max_fee, 0 # nonce starts at 0
+            contract_address,
+            class_hash,
+            calldata,
+            salt,
+            max_fee,
+            0, # nonce starts at 0
         )
 
         address, _ = await deploy_account(

From 7fa5ac7c05e5b167c9e4897a31c54067d7183647 Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Sat, 12 Nov 2022 01:38:43 -0500
Subject: [PATCH 068/109] fix _process_arguments

---
 src/nile/core/account.py | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/nile/core/account.py b/src/nile/core/account.py
index 8cbebbe4..5400a481 100644
--- a/src/nile/core/account.py
+++ b/src/nile/core/account.py
@@ -114,7 +114,7 @@ async def declare(
         watch_mode=None,
     ):
         """Declare a contract through an Account contract."""
-        max_fee, nonce = await self._process_arguments(max_fee, nonce)
+        _, max_fee, nonce = await self._process_arguments([], max_fee, nonce)
 
         contract_class = get_contract_class(
             contract_name=contract_name, overriding_path=overriding_path
@@ -172,8 +172,8 @@ async def send(
         target_address = self._get_target_address(address_or_alias)
 
         # process and parse arguments
-        max_fee, nonce, calldata = await self._process_arguments(
-            max_fee, nonce, calldata
+        calldata, max_fee, nonce = await self._process_arguments(
+            calldata, max_fee, nonce
         )
 
         # get tx version
@@ -222,7 +222,9 @@ def _get_target_address(self, address_or_alias):
 
         return target_address
 
-    async def _process_arguments(self, max_fee, nonce, calldata=None):
+    async def _process_arguments(self, calldata, max_fee, nonce):
+        calldata = [normalize_number(x) for x in calldata]
+
         if nonce is None:
             nonce = await get_nonce(self.address, self.network)
 
@@ -231,8 +233,4 @@ async def _process_arguments(self, max_fee, nonce, calldata=None):
         else:
             max_fee = int(max_fee)
 
-        if calldata is not None:
-            calldata = [normalize_number(x) for x in calldata]
-            return max_fee, nonce, calldata
-
-        return max_fee, nonce
+        return calldata, max_fee, nonce

From 6df837f07f3c3dec5d9221035a9861bdab88989b Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Sun, 13 Nov 2022 14:13:43 -0500
Subject: [PATCH 069/109] fix test

---
 tests/commands/test_get_nonce.py | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/tests/commands/test_get_nonce.py b/tests/commands/test_get_nonce.py
index b02d8e95..220864c7 100644
--- a/tests/commands/test_get_nonce.py
+++ b/tests/commands/test_get_nonce.py
@@ -15,21 +15,20 @@
     "contract_address, network",
     [("0xffff", "localhost"), ("0xffff", "goerli"), ("0xffff", "mainnet")],
 )
-@patch("nile.utils.get_nonce.get_nonce_without_log")
-async def test_get_nonce(mock_without_log, contract_address, network, caplog):
+async def test_get_nonce(contract_address, network, caplog):
     logging.getLogger().setLevel(logging.INFO)
 
-    mock_without_log.return_value = NONCE
-
-    # Check return value
-    nonce = await get_nonce(contract_address, network)
-    assert nonce == NONCE
+    with patch("nile.utils.get_nonce.call_cli", new=AsyncMock()) as mock_cli_call:
+        mock_cli_call.return_value = NONCE
+        nonce = await get_nonce(contract_address, network)
+        assert nonce == NONCE
 
-    # Check internal
-    mock_without_log.assert_called_once_with(contract_address, network)
+        args = set_args(network)
+        command_args = ["--contract_address", "0xffff"]
+        mock_cli_call.assert_called_once_with("get_nonce", args, command_args)
 
-    # Check log
-    assert f"Current Nonce: {NONCE}" in caplog.text
+        # Check log
+        assert f"Current Nonce: {NONCE}" in caplog.text
 
 
 @pytest.mark.asyncio

From 73de60a6d0a558929b1e1a9505664348e253b4eb Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Sun, 13 Nov 2022 21:21:23 -0500
Subject: [PATCH 070/109] fix tx output and error handling

---
 src/nile/core/call_or_invoke.py | 38 ++++++++++++++-------------------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/src/nile/core/call_or_invoke.py b/src/nile/core/call_or_invoke.py
index baef9540..d80ecd95 100644
--- a/src/nile/core/call_or_invoke.py
+++ b/src/nile/core/call_or_invoke.py
@@ -55,34 +55,28 @@ async def call_or_invoke(
         method,
     ]
 
-    if type == "call":
-        try:
-            return await call_cli("call", args, command_args)
-        except AbiFormatError as err:
+    try:
+        output = await call_cli(type, args, command_args)
+    except (AbiFormatError, BaseException) as err:
+        if "max_fee must be bigger than 0." in str(err):
+            logging.error(
+                """
+                \n😰 Whoops, looks like max fee is missing. Try with:\n
+                --max_fee=`MAX_FEE`
+                """
+            )
+            return
+        else:
             logging.error(err)
+            return
 
-    elif type == "invoke":
-        try:
-            output = await call_cli("invoke", args, command_args)
-        except BaseException as err:
-            if "max_fee must be bigger than 0." in str(err):
-                logging.error(
-                    """
-                    \n😰 Whoops, looks like max fee is missing. Try with:\n
-                    --max_fee=`MAX_FEE`
-                    """
-                )
-            else:
-                raise err
-
+    if type != "call" and output:
+        logging.info(output)
         if not query_flag and watch_mode:
             transaction_hash = _get_transaction_hash(output)
             return await status(normalize_number(transaction_hash), network, watch_mode)
 
-        if query_flag:
-            logging.info(output)
-
-        return output
+    return output
 
 
 def _get_transaction_hash(string):

From 86e785116763e7977a56e5a65f74aa2494eacc2a Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Sun, 13 Nov 2022 21:33:20 -0500
Subject: [PATCH 071/109] fix formatting

---
 src/nile/core/call_or_invoke.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/nile/core/call_or_invoke.py b/src/nile/core/call_or_invoke.py
index d80ecd95..b1787e23 100644
--- a/src/nile/core/call_or_invoke.py
+++ b/src/nile/core/call_or_invoke.py
@@ -2,8 +2,6 @@
 import logging
 import re
 
-from starkware.starknet.cli.starknet_cli import AbiFormatError
-
 from nile import deployments
 from nile.common import call_cli, set_args, set_command_args
 from nile.core import account
@@ -57,7 +55,7 @@ async def call_or_invoke(
 
     try:
         output = await call_cli(type, args, command_args)
-    except (AbiFormatError, BaseException) as err:
+    except BaseException as err:
         if "max_fee must be bigger than 0." in str(err):
             logging.error(
                 """

From ede00770fe15092ed0b5dc48eca11fc8a8c28bc0 Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Mon, 14 Nov 2022 10:57:09 -0500
Subject: [PATCH 072/109] add starknet_cli module

---
 src/nile/common.py              | 101 ------------------------
 src/nile/core/call_or_invoke.py |  30 ++++---
 src/nile/core/declare.py        |  20 ++---
 src/nile/core/deploy.py         |  17 ++--
 src/nile/starknet_cli.py        | 133 ++++++++++++++++++++++++++++++++
 src/nile/utils/debug.py         |  23 +++---
 src/nile/utils/get_nonce.py     |   7 +-
 src/nile/utils/status.py        |  11 +--
 8 files changed, 175 insertions(+), 167 deletions(-)
 create mode 100644 src/nile/starknet_cli.py

diff --git a/src/nile/common.py b/src/nile/common.py
index 46e7763f..749b4d9d 100644
--- a/src/nile/common.py
+++ b/src/nile/common.py
@@ -1,14 +1,9 @@
 """nile common module."""
-import io
 import json
 import os
 import re
-import sys
-from types import SimpleNamespace
 
 from starkware.crypto.signature.fast_pedersen_hash import pedersen_hash
-from starkware.starknet.cli import starknet_cli
-from starkware.starknet.cli.starknet_cli import NETWORKS
 from starkware.starknet.core.os.class_hash import compute_class_hash
 from starkware.starknet.services.api.contract_class import ContractClass
 
@@ -120,96 +115,6 @@ def is_alias(param):
     return is_string(param)
 
 
-def get_gateway_url(network):
-    """Return gateway URL for specified network."""
-    networks = ["localhost", "goerli2", "integration"]
-    if network in networks:
-        return GATEWAYS.get(network)
-    else:
-        network = "alpha-" + network
-        return f"https://{NETWORKS[network]}/gateway"
-
-
-def get_feeder_url(network):
-    """Return feeder gateway URL for specified network."""
-    networks = ["localhost", "goerli2", "integration"]
-    if network in networks:
-        return GATEWAYS.get(network)
-    else:
-        network = "alpha-" + network
-        return f"https://{NETWORKS[network]}/feeder_gateway"
-
-
-async def capture_stdout(func):
-    """Return the stdout during the passed function call."""
-    stdout = sys.stdout
-    sys.stdout = io.StringIO()
-    await func
-    output = sys.stdout.getvalue()
-    sys.stdout = stdout
-    result = output.rstrip()
-    return result
-
-
-def set_args(network):
-    """Set context args for StarkNet CLI call."""
-    args = {
-        "gateway_url": get_gateway_url(network),
-        "feeder_gateway_url": get_feeder_url(network),
-        "wallet": "",
-        "network_id": network,
-        "account_dir": None,
-        "account": None,
-    }
-    ret_obj = SimpleNamespace(**args)
-    return ret_obj
-
-
-def set_command_args(
-    contract_name=None,
-    arguments=None,
-    inputs=None,
-    signature=None,
-    max_fee=None,
-    query_flag=None,
-    overriding_path=None,
-    mainnet_token=None,
-):
-    """Set command args for StarkNet CLI call."""
-    command_args = []
-    if contract_name is not None:
-        base_path = (
-            overriding_path if overriding_path else (BUILD_DIRECTORY, ABIS_DIRECTORY)
-        )
-        contract = f"{base_path[0]}/{contract_name}.json"
-        command_args.append("--contract")
-        command_args.append(contract)
-
-    if inputs is not None:
-        command_args.append("--inputs")
-        command_args.extend(prepare_params(inputs))
-
-    if signature is not None:
-        command_args.append("--signature")
-        command_args.extend(prepare_params(signature))
-
-    if max_fee is not None:
-        command_args.append("--max_fee")
-        command_args.append(max_fee)
-
-    if mainnet_token is not None:
-        command_args.append("--token")
-        command_args.append(mainnet_token)
-
-    if query_flag is not None:
-        command_args.append(f"--{query_flag}")
-
-    if arguments is not None:
-        command_args.extend(arguments)
-
-    return command_args
-
-
 def get_contract_class(contract_name, overriding_path=None):
     """Return the contract_class for a given contract name."""
     base_path = (
@@ -229,12 +134,6 @@ def get_hash(contract_name, overriding_path=None):
     )
 
 
-def call_cli(cmd_name, args, command_args):
-    """Make call to starknet_cli and return captured stdout."""
-    cmd = getattr(starknet_cli, cmd_name)
-    return capture_stdout(cmd(args=args, command_args=command_args))
-
-
 def get_addresses_from_string(string):
     """Return a set of integers with identified addresses in a string."""
     return set(
diff --git a/src/nile/core/call_or_invoke.py b/src/nile/core/call_or_invoke.py
index b1787e23..a2f9f3da 100644
--- a/src/nile/core/call_or_invoke.py
+++ b/src/nile/core/call_or_invoke.py
@@ -3,9 +3,9 @@
 import re
 
 from nile import deployments
-from nile.common import call_cli, set_args, set_command_args
 from nile.core import account
-from nile.utils import hex_address, normalize_number
+from nile.starknet_cli import execute_call
+from nile.utils import normalize_number
 from nile.utils.status import status
 
 
@@ -39,22 +39,18 @@ async def call_or_invoke(
     else:
         address, abi = next(deployments.load(contract, network))
 
-    args = set_args(network)
-    command_args = set_command_args(
-        inputs=params, signature=signature, max_fee=max_fee, query_flag=query_flag
-    )
-
-    command_args += [
-        "--address",
-        hex_address(address),
-        "--abi",
-        abi,
-        "--function",
-        method,
-    ]
-
     try:
-        output = await call_cli(type, args, command_args)
+        output = await execute_call(
+            type,
+            network,
+            inputs=params,
+            signature=signature,
+            max_fee=max_fee,
+            query_flag=query_flag,
+            address=address,
+            abi=abi,
+            method=method,
+        )
     except BaseException as err:
         if "max_fee must be bigger than 0." in str(err):
             logging.error(
diff --git a/src/nile/core/declare.py b/src/nile/core/declare.py
index a4558e14..79e29173 100644
--- a/src/nile/core/declare.py
+++ b/src/nile/core/declare.py
@@ -2,14 +2,9 @@
 import logging
 
 from nile import deployments
-from nile.common import (
-    DECLARATIONS_FILENAME,
-    call_cli,
-    parse_information,
-    set_args,
-    set_command_args,
-)
-from nile.utils import hex_address, hex_class_hash
+from nile.common import DECLARATIONS_FILENAME, parse_information
+from nile.starknet_cli import execute_call
+from nile.utils import hex_class_hash
 from nile.utils.status import status
 
 
@@ -33,18 +28,17 @@ async def declare(
 
     max_fee = "0" if max_fee is None else str(max_fee)
 
-    args = set_args(network)
-    command_args = set_command_args(
+    output = await execute_call(
+        "declare",
+        network,
         contract_name=contract_name,
         signature=signature,
         max_fee=max_fee,
         overriding_path=overriding_path,
         mainnet_token=mainnet_token,
+        sender=sender,
     )
 
-    command_args += ["--sender", hex_address(sender)]
-
-    output = await call_cli("declare", args, command_args)
     class_hash, tx_hash = parse_information(output)
     padded_hash = hex_class_hash(class_hash)
     logging.info(f"⏳ Successfully sent declaration of {contract_name} as {padded_hash}")
diff --git a/src/nile/core/deploy.py b/src/nile/core/deploy.py
index b8a06fc9..559e75be 100644
--- a/src/nile/core/deploy.py
+++ b/src/nile/core/deploy.py
@@ -2,14 +2,8 @@
 import logging
 
 from nile import deployments
-from nile.common import (
-    ABIS_DIRECTORY,
-    BUILD_DIRECTORY,
-    call_cli,
-    parse_information,
-    set_args,
-    set_command_args,
-)
+from nile.common import ABIS_DIRECTORY, BUILD_DIRECTORY, parse_information
+from nile.starknet_cli import execute_call
 from nile.utils import hex_address
 from nile.utils.status import status
 
@@ -32,15 +26,14 @@ async def deploy(
     )
     register_abi = abi if abi is not None else f"{base_path[1]}/{contract_name}.json"
 
-    args = set_args(network)
-    command_args = set_command_args(
+    output = await execute_call(
+        "deploy",
+        network,
         contract_name=contract_name,
         inputs=arguments,
         overriding_path=overriding_path,
         mainnet_token=mainnet_token,
     )
-
-    output = await call_cli("deploy", args, command_args)
     address, tx_hash = parse_information(output)
 
     logging.info(
diff --git a/src/nile/starknet_cli.py b/src/nile/starknet_cli.py
new file mode 100644
index 00000000..24890b32
--- /dev/null
+++ b/src/nile/starknet_cli.py
@@ -0,0 +1,133 @@
+"""Call the starknet_cli."""
+
+import io
+import sys
+from types import SimpleNamespace
+
+from starkware.starknet.cli import starknet_cli
+from starkware.starknet.cli.starknet_cli import NETWORKS
+
+from nile.common import ABIS_DIRECTORY, BUILD_DIRECTORY, GATEWAYS, prepare_params
+from nile.utils import hex_address, hex_class_hash
+
+
+async def execute_call(cmd_name, network, **kwargs):
+    """Build and execute call to starknet_cli."""
+    args = set_args(network)
+    command_args = set_command_args(**kwargs)
+    cmd = getattr(starknet_cli, cmd_name)
+    return await capture_stdout(cmd(args=args, command_args=command_args))
+
+
+async def capture_stdout(func):
+    """Return the stdout during the passed function call."""
+    stdout = sys.stdout
+    sys.stdout = io.StringIO()
+    await func
+    output = sys.stdout.getvalue()
+    sys.stdout = stdout
+    result = output.rstrip()
+    return result
+
+
+def set_args(network):
+    """Set context args for StarkNet CLI call."""
+    args = {
+        "gateway_url": get_gateway_url(network),
+        "feeder_gateway_url": get_feeder_url(network),
+        "wallet": "",
+        "network_id": network,
+        "account_dir": None,
+        "account": None,
+    }
+    ret_obj = SimpleNamespace(**args)
+    return ret_obj
+
+
+def set_command_args(**kwargs):
+    """Set command args for StarkNet CLI call."""
+    command_args = []
+    if kwargs.get("contract_name"):
+        base_path = (
+            kwargs.get("overriding_path")
+            if kwargs.get("overriding_path")
+            else (BUILD_DIRECTORY, ABIS_DIRECTORY)
+        )
+        contract = f"{base_path[0]}/{kwargs.get('contract_name')}.json"
+        command_args.append("--contract")
+        command_args.append(contract)
+
+    if kwargs.get("contracts"):
+        command_args.append("--contracts")
+        command_args.extend(kwargs.get("contracts"))
+
+    if kwargs.get("contract_address"):
+        command_args.append("--contract_address")
+        command_args.append(kwargs.get("contract_address"))
+
+    if kwargs.get("inputs"):
+        command_args.append("--inputs")
+        command_args.extend(prepare_params(kwargs.get("inputs")))
+
+    if kwargs.get("signature"):
+        command_args.append("--signature")
+        command_args.extend(prepare_params(kwargs.get("signature")))
+
+    if kwargs.get("address"):
+        command_args.append("--address")
+        command_args.append(hex_address(kwargs.get("address")))
+
+    if kwargs.get("abi"):
+        command_args.append("--abi")
+        command_args.append(kwargs.get("abi"))
+
+    if kwargs.get("method"):
+        command_args.append("--function")
+        command_args.append(kwargs.get("method"))
+
+    if kwargs.get("sender"):
+        command_args.append("--sender")
+        command_args.append(hex_address(kwargs.get("sender")))
+
+    if kwargs.get("max_fee"):
+        command_args.append("--max_fee")
+        command_args.append(kwargs.get("max_fee"))
+
+    if kwargs.get("mainnet_token"):
+        command_args.append("--token")
+        command_args.append(kwargs.get("mainnet_token"))
+
+    if kwargs.get("hash"):
+        command_args.append("--hash")
+        command_args.append(hex_class_hash(kwargs.get("hash")))
+
+    if kwargs.get("query_flag"):
+        command_args.append(f"--{kwargs.get('query_flag')}")
+
+    if kwargs.get("error_message"):
+        command_args.append("--error_message")
+
+    if kwargs.get("arguments"):
+        command_args.extend(kwargs.get("arguments"))
+
+    return command_args
+
+
+def get_gateway_url(network):
+    """Return gateway URL for specified network."""
+    networks = ["localhost", "goerli2", "integration"]
+    if network in networks:
+        return GATEWAYS.get(network)
+    else:
+        network = "alpha-" + network
+        return f"https://{NETWORKS[network]}/gateway"
+
+
+def get_feeder_url(network):
+    """Return feeder gateway URL for specified network."""
+    networks = ["localhost", "goerli2", "integration"]
+    if network in networks:
+        return GATEWAYS.get(network)
+    else:
+        network = "alpha-" + network
+        return f"https://{NETWORKS[network]}/feeder_gateway"
diff --git a/src/nile/utils/debug.py b/src/nile/utils/debug.py
index 14511a54..51ebf4b4 100644
--- a/src/nile/utils/debug.py
+++ b/src/nile/utils/debug.py
@@ -3,21 +3,16 @@
 import logging
 import os
 
-from nile.common import (
-    BUILD_DIRECTORY,
-    DEPLOYMENTS_FILENAME,
-    call_cli,
-    get_addresses_from_string,
-    set_args,
-)
+from nile.common import BUILD_DIRECTORY, DEPLOYMENTS_FILENAME, get_addresses_from_string
+from nile.starknet_cli import execute_call
 
 
-async def debug_message(error_message, command, network, contracts_file=None):
+async def debug_message(error_message, tx_hash, network, contracts_file=None):
     """
     Use available contracts to help locate the error in a rejected transaction.
 
     @param error_message: error message of the transaction receipt.
-    @param command: StarkNet CLI command used to get the transaction receipt.
+    @param tx_hash: hash of the transaction.
     @param network: Network queried
     @param contracts_file: File to use instead of the one generated automatically
       from network name.
@@ -43,9 +38,13 @@ async def debug_message(error_message, command, network, contracts_file=None):
     logging.info(f"🧾 Found contracts: {contracts}")
     logging.info("⏳ Querying the network with identified contracts...")
 
-    args = set_args(network)
-    command_args = command + ["--contracts", ",".join(contracts), "--error_message"]
-    return await call_cli("tx_status", args, command_args)
+    return await execute_call(
+        "tx_status",
+        network,
+        hash=tx_hash,
+        contracts=",".join(contracts),
+        error_message=True,
+    )
 
 
 def _get_contracts_data(contracts_file, network, addresses):
diff --git a/src/nile/utils/get_nonce.py b/src/nile/utils/get_nonce.py
index 03d04ce6..f8a1736c 100644
--- a/src/nile/utils/get_nonce.py
+++ b/src/nile/utils/get_nonce.py
@@ -1,7 +1,7 @@
 """Retrieve nonce for a contract."""
 import logging
 
-from nile.common import call_cli, set_args
+from nile.starknet_cli import execute_call
 
 
 async def get_nonce(contract_address, network):
@@ -19,8 +19,5 @@ async def get_nonce_without_log(contract_address, network):
     if not str(contract_address).startswith("0x"):
         contract_address = hex(int(contract_address))
 
-    command_args = ["--contract_address", contract_address]
-    args = set_args(network)
-
-    output = await call_cli("get_nonce", args, command_args)
+    output = await execute_call("get_nonce", network, contract_address=contract_address)
     return int(output)
diff --git a/src/nile/utils/status.py b/src/nile/utils/status.py
index a8124217..9e0145e9 100644
--- a/src/nile/utils/status.py
+++ b/src/nile/utils/status.py
@@ -6,8 +6,8 @@
 from collections import namedtuple
 from enum import Enum
 
-from nile.common import RETRY_AFTER_SECONDS, call_cli, set_args
-from nile.utils import hex_class_hash
+from nile.common import RETRY_AFTER_SECONDS
+from nile.starknet_cli import execute_call
 from nile.utils.debug import debug_message
 
 TransactionStatus = namedtuple(
@@ -25,11 +25,8 @@ async def status(
     """
     logging.info("⏳ Querying the network for transaction status...")
 
-    args = set_args(network)
-    command_args = ["--hash", hex_class_hash(tx_hash)]
-
     while True:
-        tx_status = await call_cli("tx_status", args=args, command_args=command_args)
+        tx_status = await execute_call("tx_status", network, hash=tx_hash)
         raw_receipt = json.loads(tx_status)
         receipt = _get_tx_receipt(tx_hash, raw_receipt, watch_mode)
         if receipt is not None:
@@ -41,7 +38,7 @@ async def status(
     error_message = receipt.receipt["tx_failure_reason"]["error_message"]
     if watch_mode == "debug":
         error_message = await debug_message(
-            error_message, command_args, network, contracts_file
+            error_message, tx_hash, network, contracts_file
         )
 
     logging.info(f"🧾 Error message:\n{error_message}")

From 97bc116d957ae864bade81d33ed3ad49b3d291c3 Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Mon, 14 Nov 2022 12:01:13 -0500
Subject: [PATCH 073/109] improve command_args handling

---
 src/nile/core/call_or_invoke.py |  9 +++--
 src/nile/core/declare.py        |  6 +--
 src/nile/core/deploy.py         |  9 ++++-
 src/nile/starknet_cli.py        | 66 ++++++++++++---------------------
 src/nile/utils/status.py        |  6 ++-
 5 files changed, 43 insertions(+), 53 deletions(-)

diff --git a/src/nile/core/call_or_invoke.py b/src/nile/core/call_or_invoke.py
index a2f9f3da..968d5efa 100644
--- a/src/nile/core/call_or_invoke.py
+++ b/src/nile/core/call_or_invoke.py
@@ -3,9 +3,10 @@
 import re
 
 from nile import deployments
+from nile.common import prepare_params
 from nile.core import account
 from nile.starknet_cli import execute_call
-from nile.utils import normalize_number
+from nile.utils import hex_address, normalize_number
 from nile.utils.status import status
 
 
@@ -43,11 +44,11 @@ async def call_or_invoke(
         output = await execute_call(
             type,
             network,
-            inputs=params,
-            signature=signature,
+            inputs=prepare_params(params),
+            signature=prepare_params(signature),
             max_fee=max_fee,
             query_flag=query_flag,
-            address=address,
+            address=hex_address(address),
             abi=abi,
             method=method,
         )
diff --git a/src/nile/core/declare.py b/src/nile/core/declare.py
index 79e29173..2224ae7e 100644
--- a/src/nile/core/declare.py
+++ b/src/nile/core/declare.py
@@ -2,7 +2,7 @@
 import logging
 
 from nile import deployments
-from nile.common import DECLARATIONS_FILENAME, parse_information
+from nile.common import DECLARATIONS_FILENAME, parse_information, prepare_params
 from nile.starknet_cli import execute_call
 from nile.utils import hex_class_hash
 from nile.utils.status import status
@@ -32,11 +32,11 @@ async def declare(
         "declare",
         network,
         contract_name=contract_name,
-        signature=signature,
+        signature=prepare_params(signature),
         max_fee=max_fee,
         overriding_path=overriding_path,
         mainnet_token=mainnet_token,
-        sender=sender,
+        sender=hex_class_hash(sender),
     )
 
     class_hash, tx_hash = parse_information(output)
diff --git a/src/nile/core/deploy.py b/src/nile/core/deploy.py
index 559e75be..12575004 100644
--- a/src/nile/core/deploy.py
+++ b/src/nile/core/deploy.py
@@ -2,7 +2,12 @@
 import logging
 
 from nile import deployments
-from nile.common import ABIS_DIRECTORY, BUILD_DIRECTORY, parse_information
+from nile.common import (
+    ABIS_DIRECTORY,
+    BUILD_DIRECTORY,
+    parse_information,
+    prepare_params,
+)
 from nile.starknet_cli import execute_call
 from nile.utils import hex_address
 from nile.utils.status import status
@@ -30,7 +35,7 @@ async def deploy(
         "deploy",
         network,
         contract_name=contract_name,
-        inputs=arguments,
+        inputs=prepare_params(arguments),
         overriding_path=overriding_path,
         mainnet_token=mainnet_token,
     )
diff --git a/src/nile/starknet_cli.py b/src/nile/starknet_cli.py
index 24890b32..21d7dfb0 100644
--- a/src/nile/starknet_cli.py
+++ b/src/nile/starknet_cli.py
@@ -7,8 +7,20 @@
 from starkware.starknet.cli import starknet_cli
 from starkware.starknet.cli.starknet_cli import NETWORKS
 
-from nile.common import ABIS_DIRECTORY, BUILD_DIRECTORY, GATEWAYS, prepare_params
-from nile.utils import hex_address, hex_class_hash
+from nile.common import ABIS_DIRECTORY, BUILD_DIRECTORY, GATEWAYS
+
+ARGS = [
+    "contracts",
+    "contract_address",
+    "inputs",
+    "signature",
+    "address",
+    "abi",
+    "sender",
+    "max_fee",
+    "mainnet_token",
+    "hash",
+]
 
 
 async def execute_call(cmd_name, network, **kwargs):
@@ -47,6 +59,12 @@ def set_args(network):
 def set_command_args(**kwargs):
     """Set command args for StarkNet CLI call."""
     command_args = []
+
+    for arg in ARGS:
+        if kwargs.get(arg):
+            command_args += _add_args(arg, kwargs.get(arg))
+
+    # The rest of the arguments require unique handling
     if kwargs.get("contract_name"):
         base_path = (
             kwargs.get("overriding_path")
@@ -57,50 +75,10 @@ def set_command_args(**kwargs):
         command_args.append("--contract")
         command_args.append(contract)
 
-    if kwargs.get("contracts"):
-        command_args.append("--contracts")
-        command_args.extend(kwargs.get("contracts"))
-
-    if kwargs.get("contract_address"):
-        command_args.append("--contract_address")
-        command_args.append(kwargs.get("contract_address"))
-
-    if kwargs.get("inputs"):
-        command_args.append("--inputs")
-        command_args.extend(prepare_params(kwargs.get("inputs")))
-
-    if kwargs.get("signature"):
-        command_args.append("--signature")
-        command_args.extend(prepare_params(kwargs.get("signature")))
-
-    if kwargs.get("address"):
-        command_args.append("--address")
-        command_args.append(hex_address(kwargs.get("address")))
-
-    if kwargs.get("abi"):
-        command_args.append("--abi")
-        command_args.append(kwargs.get("abi"))
-
     if kwargs.get("method"):
         command_args.append("--function")
         command_args.append(kwargs.get("method"))
 
-    if kwargs.get("sender"):
-        command_args.append("--sender")
-        command_args.append(hex_address(kwargs.get("sender")))
-
-    if kwargs.get("max_fee"):
-        command_args.append("--max_fee")
-        command_args.append(kwargs.get("max_fee"))
-
-    if kwargs.get("mainnet_token"):
-        command_args.append("--token")
-        command_args.append(kwargs.get("mainnet_token"))
-
-    if kwargs.get("hash"):
-        command_args.append("--hash")
-        command_args.append(hex_class_hash(kwargs.get("hash")))
-
     if kwargs.get("query_flag"):
         command_args.append(f"--{kwargs.get('query_flag')}")
 
@@ -131,3 +109,7 @@ def get_feeder_url(network):
     else:
         network = "alpha-" + network
         return f"https://{NETWORKS[network]}/feeder_gateway"
+
+
+def _add_args(key, value):
+    return [f"--{key}", *value] if type(value) is list else [f"--{key}", value]
diff --git a/src/nile/utils/status.py b/src/nile/utils/status.py
index 9e0145e9..6b90f837 100644
--- a/src/nile/utils/status.py
+++ b/src/nile/utils/status.py
@@ -6,7 +6,7 @@
 from collections import namedtuple
 from enum import Enum
 
-from nile.common import RETRY_AFTER_SECONDS
+from nile.common import RETRY_AFTER_SECONDS, hex_class_hash
 from nile.starknet_cli import execute_call
 from nile.utils.debug import debug_message
 
@@ -26,7 +26,9 @@ async def status(
     logging.info("⏳ Querying the network for transaction status...")
 
     while True:
-        tx_status = await execute_call("tx_status", network, hash=tx_hash)
+        tx_status = await execute_call(
+            "tx_status", network, hash=hex_class_hash(tx_hash)
+        )
         raw_receipt = json.loads(tx_status)
         receipt = _get_tx_receipt(tx_hash, raw_receipt, watch_mode)
         if receipt is not None:

From 0bbb76490219297df8525e9cb44cc9b296f88c3f Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Mon, 14 Nov 2022 18:45:01 -0500
Subject: [PATCH 074/109] fix sender param

---
 src/nile/core/declare.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/nile/core/declare.py b/src/nile/core/declare.py
index 2224ae7e..9b00c611 100644
--- a/src/nile/core/declare.py
+++ b/src/nile/core/declare.py
@@ -4,7 +4,7 @@
 from nile import deployments
 from nile.common import DECLARATIONS_FILENAME, parse_information, prepare_params
 from nile.starknet_cli import execute_call
-from nile.utils import hex_class_hash
+from nile.utils import hex_address, hex_class_hash
 from nile.utils.status import status
 
 
@@ -36,7 +36,7 @@ async def declare(
         max_fee=max_fee,
         overriding_path=overriding_path,
         mainnet_token=mainnet_token,
-        sender=hex_class_hash(sender),
+        sender=hex_address(sender),
     )
 
     class_hash, tx_hash = parse_information(output)

From b808dfbf56fae96f24ac79859e0553f68b85e69d Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Mon, 14 Nov 2022 18:46:25 -0500
Subject: [PATCH 075/109] fix docstring formatting

---
 src/nile/utils/debug.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/nile/utils/debug.py b/src/nile/utils/debug.py
index 51ebf4b4..665df631 100644
--- a/src/nile/utils/debug.py
+++ b/src/nile/utils/debug.py
@@ -11,9 +11,9 @@ async def debug_message(error_message, tx_hash, network, contracts_file=None):
     """
     Use available contracts to help locate the error in a rejected transaction.
 
-    @param error_message: error message of the transaction receipt.
-    @param tx_hash: hash of the transaction.
-    @param network: Network queried
+    @param error_message: Error message of the transaction receipt.
+    @param tx_hash: Hash of the transaction.
+    @param network: Network queried.
     @param contracts_file: File to use instead of the one generated automatically
       from network name.
     """

From cc585105e1d136586088758e6be0b85ac30aa557 Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Mon, 14 Nov 2022 18:46:50 -0500
Subject: [PATCH 076/109] add starknet_cli tests

---
 tests/test_starknet_cli.py | 138 +++++++++++++++++++++++++++++++++++++
 1 file changed, 138 insertions(+)
 create mode 100644 tests/test_starknet_cli.py

diff --git a/tests/test_starknet_cli.py b/tests/test_starknet_cli.py
new file mode 100644
index 00000000..b9fb8b77
--- /dev/null
+++ b/tests/test_starknet_cli.py
@@ -0,0 +1,138 @@
+"""Tests for starknet_cli module."""
+from types import SimpleNamespace
+from unittest.mock import MagicMock, patch
+
+import pytest
+
+from nile.starknet_cli import (
+    _add_args,
+    capture_stdout,
+    get_feeder_url,
+    get_gateway_url,
+    set_args,
+    set_command_args,
+)
+
+NETWORK = "localhost"
+INPUTS = ["1", "2"]
+CONTRACT_NAME = "contract"
+ADDRESS = "0x1234"
+STDOUT_1 = "SDTOUT_1"
+STDOUT_2 = "SDTOUT_2"
+
+
+@pytest.mark.parametrize(
+    "network, url",
+    [
+        ("localhost", "http://127.0.0.1:5050/"),
+        ("goerli", "https://alpha4.starknet.io/"),
+        ("mainnet", "https://alpha-mainnet.starknet.io/"),
+    ],
+)
+def test_set_args(network, url):
+    args = set_args(network)
+    _dict = {
+        "gateway_url": url + "gateway",
+        "feeder_gateway_url": url + "feeder_gateway",
+        "wallet": "",
+        "network_id": network,
+        "account_dir": None,
+        "account": None,
+    }
+
+    # "localhost" does not add suffix
+    if network == "localhost":
+        _dict["gateway_url"] = url
+        _dict["feeder_gateway_url"] = url
+
+    expected = SimpleNamespace(**_dict)
+    assert args == expected
+
+
+@pytest.mark.parametrize(
+    "args, expected",
+    [
+        (["k", "v1"], ["--k", "v1"]),
+        (["k", ["v1", "v2"]], ["--k", "v1", "v2"]),
+    ],
+)
+def test__add_args(args, expected):
+    result = _add_args(*args)
+    assert result == expected
+
+
+@pytest.mark.parametrize(
+    "args, expected",
+    [
+        (
+            {"inputs": INPUTS, "address": ADDRESS},
+            ["--inputs", "1", "2", "--address", ADDRESS],
+        ),
+        (
+            {"inputs": INPUTS, "contract_name": CONTRACT_NAME},
+            ["--inputs", "1", "2", "--contract", f"artifacts/{CONTRACT_NAME}.json"],
+        ),
+        (
+            {"method": "METHOD", "query_flag": "simulate"},
+            ["--function", "METHOD", "--simulate"],
+        ),
+        (
+            {"error_message": True, "arguments": INPUTS},
+            ["--error_message", "1", "2"],
+        ),
+    ],
+)
+def test_set_command_args(args, expected):
+    result = set_command_args(**args)
+    assert result == expected
+
+
+@pytest.mark.parametrize(
+    "network, expected",
+    [
+        ("localhost", "http://127.0.0.1:5050/"),
+        ("goerli", "https://alpha4.starknet.io/gateway"),
+        ("mainnet", "https://alpha-mainnet.starknet.io/gateway"),
+    ],
+)
+def test_get_gateway_url(network, expected):
+    if network == "localhost":
+        with patch("nile.starknet_cli.GATEWAYS") as mock_gateways:
+            mock_gateways.get = MagicMock(return_value=expected)
+            url = get_gateway_url(network)
+            assert url == expected
+
+    else:
+        url = get_gateway_url(network)
+        assert url == expected
+
+
+@pytest.mark.parametrize(
+    "network, expected",
+    [
+        ("localhost", "http://127.0.0.1:5050/"),
+        ("goerli", "https://alpha4.starknet.io/feeder_gateway"),
+        ("mainnet", "https://alpha-mainnet.starknet.io/feeder_gateway"),
+    ],
+)
+def test_get_feeder_url(network, expected):
+    if network == "localhost":
+        with patch("nile.starknet_cli.GATEWAYS") as mock_gateways:
+            mock_gateways.get = MagicMock(return_value=expected)
+            url = get_feeder_url(network)
+            assert url == expected
+
+    else:
+        url = get_feeder_url(network)
+        assert url == expected
+
+
+@pytest.mark.asyncio
+async def test_capture_stdout():
+    async def helper():
+        print(STDOUT_1)
+        print(STDOUT_2)
+
+    output = await capture_stdout(helper())
+
+    assert f"{STDOUT_1}\n{STDOUT_2}" in output

From 303d634f7d04563bb43d0b94523b6a7a8bdd9c66 Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Mon, 14 Nov 2022 18:47:15 -0500
Subject: [PATCH 077/109] fix status test

---
 tests/test_cli.py | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/tests/test_cli.py b/tests/test_cli.py
index ff746dc2..bf981c41 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -22,7 +22,6 @@
     BUILD_DIRECTORY,
     CONTRACTS_DIRECTORY,
     NODE_FILENAME,
-    set_args,
 )
 from nile.utils import hex_class_hash
 
@@ -195,8 +194,8 @@ async def test_node_runs_gateway(opts, expected):
     ],
 )
 async def test_status(args):
-    with patch("nile.utils.status.call_cli", new=AsyncMock()) as mock_call_cli:
-        mock_call_cli.return_value = json.dumps({"tx_status": "ACCEPTED_ON_L2"})
+    with patch("nile.utils.status.execute_call", new=AsyncMock()) as mock_execute:
+        mock_execute.return_value = json.dumps({"tx_status": "ACCEPTED_ON_L2"})
 
         result = await CliRunner().invoke(cli, ["status", *args])
 
@@ -205,9 +204,6 @@ async def test_status(args):
 
         # Check internals
         network = args[2]
-        args = set_args(network)
-        command_args = ["--hash", hex_class_hash(MOCK_HASH)]
+        command_args = {"hash": hex_class_hash(MOCK_HASH)}
 
-        mock_call_cli.assert_called_once_with(
-            "tx_status", args=args, command_args=command_args
-        )
+        mock_execute.assert_called_once_with("tx_status", network, **command_args)

From 517a56422db1c89acf4ebc7f54fb9748dce44584 Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Mon, 14 Nov 2022 18:47:55 -0500
Subject: [PATCH 078/109] move tests to starknet_cli

---
 tests/test_common.py | 62 +-------------------------------------------
 1 file changed, 1 insertion(+), 61 deletions(-)

diff --git a/tests/test_common.py b/tests/test_common.py
index 1ae00b93..a9302867 100644
--- a/tests/test_common.py
+++ b/tests/test_common.py
@@ -1,16 +1,7 @@
 """Tests for common library."""
-from unittest.mock import MagicMock, patch
-
 import pytest
 
-from nile.common import (
-    capture_stdout,
-    get_feeder_url,
-    get_gateway_url,
-    parse_information,
-    prepare_params,
-    stringify,
-)
+from nile.common import parse_information, prepare_params, stringify
 
 NETWORK = "goerli"
 ARGS = ["1", "2", "3"]
@@ -50,57 +41,6 @@ def test_prepare_params(args, expected):
     assert prepare_params(args) == expected
 
 
-@pytest.mark.parametrize(
-    "network, expected",
-    [
-        ("localhost", "http://127.0.0.1:5050/"),
-        ("goerli", "https://alpha4.starknet.io/gateway"),
-        ("mainnet", "https://alpha-mainnet.starknet.io/gateway"),
-    ],
-)
-def test_get_gateway_url(network, expected):
-    if network == "localhost":
-        with patch("nile.common.GATEWAYS") as mock_gateways:
-            mock_gateways.get = MagicMock(return_value=expected)
-            url = get_gateway_url(network)
-            assert url == expected
-
-    else:
-        url = get_gateway_url(network)
-        assert url == expected
-
-
-@pytest.mark.parametrize(
-    "network, expected",
-    [
-        ("localhost", "http://127.0.0.1:5050/"),
-        ("goerli", "https://alpha4.starknet.io/feeder_gateway"),
-        ("mainnet", "https://alpha-mainnet.starknet.io/feeder_gateway"),
-    ],
-)
-def test_get_feeder_url(network, expected):
-    if network == "localhost":
-        with patch("nile.common.GATEWAYS") as mock_gateways:
-            mock_gateways.get = MagicMock(return_value=expected)
-            url = get_feeder_url(network)
-            assert url == expected
-
-    else:
-        url = get_feeder_url(network)
-        assert url == expected
-
-
-@pytest.mark.asyncio
-async def test_capture_stdout():
-    async def helper():
-        print(STDOUT_1)
-        print(STDOUT_2)
-
-    output = await capture_stdout(helper())
-
-    assert f"{STDOUT_1}\n{STDOUT_2}" in output
-
-
 def test_parse_information():
     a = format(1, "#066x")
     b = format(2, "#066x")

From 42cca30b15426242088b2ac92dc511cc6c7e85b0 Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Mon, 14 Nov 2022 18:48:32 -0500
Subject: [PATCH 079/109] update patch location

---
 tests/commands/test_declare.py   | 84 ++++++++++++++------------------
 tests/commands/test_deploy.py    |  2 +-
 tests/commands/test_get_nonce.py | 20 ++++----
 3 files changed, 48 insertions(+), 58 deletions(-)

diff --git a/tests/commands/test_declare.py b/tests/commands/test_declare.py
index 3d7b7ad9..2e06b76e 100644
--- a/tests/commands/test_declare.py
+++ b/tests/commands/test_declare.py
@@ -4,7 +4,7 @@
 
 import pytest
 
-from nile.common import ABIS_DIRECTORY, BUILD_DIRECTORY, DECLARATIONS_FILENAME, set_args
+from nile.common import ABIS_DIRECTORY, BUILD_DIRECTORY, DECLARATIONS_FILENAME
 from nile.core.declare import alias_exists, declare
 from nile.utils import hex_address, hex_class_hash
 
@@ -40,62 +40,54 @@ def test_alias_exists():
 
 @pytest.mark.asyncio
 @pytest.mark.parametrize(
-    "args, exp_command, exp_register",
+    "args, cmd_args, exp_register",
     [
         (
             [SENDER, CONTRACT, SIGNATURE, NETWORK],  # args
-            [  # expected command
-                "--contract",
-                f"{PATH[0]}/{CONTRACT}.json",
-                "--signature",
-                *SIGNATURE,
-                "--max_fee",
-                "0",
-                "--sender",
-                hex_address(SENDER),
-            ],
+            {  # expected command args
+                "contract_name": CONTRACT,
+                "signature": SIGNATURE,
+                "max_fee": "0",
+                "overriding_path": None,
+                "mainnet_token": None,
+                "sender": hex_address(SENDER),
+            },
             [hex_class_hash(HASH), NETWORK, None],  # expected register
         ),
         (
             [SENDER, CONTRACT, SIGNATURE, NETWORK, ALIAS],  # args
-            [  # expected command
-                "--contract",
-                f"{PATH[0]}/{CONTRACT}.json",
-                "--signature",
-                *SIGNATURE,
-                "--max_fee",
-                "0",
-                "--sender",
-                hex_address(SENDER),
-            ],
+            {  # expected command args
+                "contract_name": CONTRACT,
+                "signature": SIGNATURE,
+                "max_fee": "0",
+                "overriding_path": None,
+                "mainnet_token": None,
+                "sender": hex_address(SENDER),
+            },
             [hex_class_hash(HASH), NETWORK, ALIAS],  # expected register
         ),
         (
             [SENDER, CONTRACT, SIGNATURE, NETWORK, ALIAS, OVERRIDING_PATH],  # args
-            [  # expected command
-                "--contract",
-                f"{OVERRIDING_PATH[0]}/{CONTRACT}.json",
-                "--signature",
-                *SIGNATURE,
-                "--max_fee",
-                "0",
-                "--sender",
-                hex_address(SENDER),
-            ],
+            {  # expected command args
+                "contract_name": CONTRACT,
+                "signature": SIGNATURE,
+                "max_fee": "0",
+                "overriding_path": OVERRIDING_PATH,
+                "mainnet_token": None,
+                "sender": hex_address(SENDER),
+            },
             [hex_class_hash(HASH), NETWORK, ALIAS],  # expected register
         ),
         (
             [SENDER, CONTRACT, SIGNATURE, NETWORK, ALIAS, PATH, MAX_FEE],  # args
-            [  # expected command
-                "--contract",
-                f"{PATH[0]}/{CONTRACT}.json",
-                "--signature",
-                *SIGNATURE,
-                "--max_fee",
-                MAX_FEE,
-                "--sender",
-                hex_address(SENDER),
-            ],
+            {  # expected command args
+                "contract_name": CONTRACT,
+                "signature": SIGNATURE,
+                "max_fee": MAX_FEE,
+                "overriding_path": PATH,
+                "mainnet_token": None,
+                "sender": hex_address(SENDER),
+            },
             [hex_class_hash(HASH), NETWORK, ALIAS],  # expected register
         ),
     ],
@@ -107,20 +99,18 @@ async def test_declare(
     mock_parse,
     caplog,
     args,
-    exp_command,
+    cmd_args,
     exp_register,
 ):
     logging.getLogger().setLevel(logging.INFO)
-    with patch("nile.core.declare.call_cli", new=AsyncMock()) as mock_cli_call:
+    with patch("nile.core.declare.execute_call", new=AsyncMock()) as mock_cli_call:
         mock_cli_call.return_value = CALL_OUTPUT
         # check return value
         res = await declare(*args)
         assert res == hex_class_hash(HASH)
 
         # check internals
-        args = set_args(NETWORK)
-
-        mock_cli_call.assert_called_once_with("declare", args, exp_command)
+        mock_cli_call.assert_called_once_with("declare", NETWORK, **cmd_args)
         mock_parse.assert_called_once_with(CALL_OUTPUT)
         mock_register.assert_called_once_with(*exp_register)
 
diff --git a/tests/commands/test_deploy.py b/tests/commands/test_deploy.py
index 112ffaa7..5c370222 100644
--- a/tests/commands/test_deploy.py
+++ b/tests/commands/test_deploy.py
@@ -55,7 +55,7 @@ def tmp_working_dir(monkeypatch, tmp_path):
 async def test_deploy(mock_register, mock_parse, caplog, args, exp_abi):
     logging.getLogger().setLevel(logging.INFO)
 
-    with patch("nile.core.deploy.call_cli", new=AsyncMock()) as mock_cli_call:
+    with patch("nile.core.deploy.execute_call", new=AsyncMock()) as mock_cli_call:
         mock_cli_call.return_value = CALL_OUTPUT
 
         # check return values
diff --git a/tests/commands/test_get_nonce.py b/tests/commands/test_get_nonce.py
index 220864c7..3b5e81ca 100644
--- a/tests/commands/test_get_nonce.py
+++ b/tests/commands/test_get_nonce.py
@@ -4,10 +4,10 @@
 
 import pytest
 
-from nile.common import set_args
 from nile.utils.get_nonce import get_nonce, get_nonce_without_log
 
 NONCE = 5
+NETWORK = "localhost"
 
 
 @pytest.mark.asyncio
@@ -18,14 +18,14 @@
 async def test_get_nonce(contract_address, network, caplog):
     logging.getLogger().setLevel(logging.INFO)
 
-    with patch("nile.utils.get_nonce.call_cli", new=AsyncMock()) as mock_cli_call:
+    with patch("nile.utils.get_nonce.execute_call", new=AsyncMock()) as mock_cli_call:
         mock_cli_call.return_value = NONCE
         nonce = await get_nonce(contract_address, network)
         assert nonce == NONCE
 
-        args = set_args(network)
-        command_args = ["--contract_address", "0xffff"]
-        mock_cli_call.assert_called_once_with("get_nonce", args, command_args)
+        # args = set_args(network)
+        command_args = {"contract_address": "0xffff"}
+        mock_cli_call.assert_called_once_with("get_nonce", network, **command_args)
 
         # Check log
         assert f"Current Nonce: {NONCE}" in caplog.text
@@ -37,10 +37,10 @@ async def test_get_nonce(contract_address, network, caplog):
     ["0x4d2", "1234", 1234],
 )
 async def test_get_nonce_without_log_address_formats(contract_address):
-    with patch("nile.utils.get_nonce.call_cli", new=AsyncMock()) as mock_cli_call:
+    with patch("nile.utils.get_nonce.execute_call", new=AsyncMock()) as mock_cli_call:
         mock_cli_call.return_value = NONCE
-        await get_nonce_without_log(contract_address, "goerli")
+        await get_nonce_without_log(contract_address, NETWORK)
 
-        args = set_args("goerli")
-        command_args = ["--contract_address", "0x4d2"]
-        mock_cli_call.assert_called_once_with("get_nonce", args, command_args)
+        # args = set_args("goerli")
+        command_args = {"contract_address": "0x4d2"}
+        mock_cli_call.assert_called_once_with("get_nonce", NETWORK, **command_args)

From 483cd3a56ff5e01780ff9232809f6d70d658a2a6 Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Mon, 14 Nov 2022 19:51:45 -0500
Subject: [PATCH 080/109] test args in execute_call

---
 tests/commands/test_deploy.py | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/tests/commands/test_deploy.py b/tests/commands/test_deploy.py
index 5c370222..7bd5cb47 100644
--- a/tests/commands/test_deploy.py
+++ b/tests/commands/test_deploy.py
@@ -30,29 +30,53 @@ def tmp_working_dir(monkeypatch, tmp_path):
 
 @pytest.mark.asyncio
 @pytest.mark.parametrize(
-    "args, exp_abi",
+    "args, cmd_args, exp_abi",
     [
         (
             [CONTRACT, ARGS, NETWORK, ALIAS],  # args
+            {
+                "contract_name": CONTRACT,
+                "inputs": ["1", "2", "3"],
+                "overriding_path": None,
+                "mainnet_token": None,
+            },
             ABI,  # expected ABI
         ),
         (
             [CONTRACT, ARGS, NETWORK, ALIAS, PATH_OVERRIDE],  # args
+            {
+                "contract_name": CONTRACT,
+                "inputs": ["1", "2", "3"],
+                "overriding_path": PATH_OVERRIDE,
+                "mainnet_token": None,
+            },
             ABI,  # expected ABI
         ),
         (
             [CONTRACT, ARGS, NETWORK, ALIAS, None, ABI_OVERRIDE],  # args
+            {
+                "contract_name": CONTRACT,
+                "inputs": ["1", "2", "3"],
+                "overriding_path": None,
+                "mainnet_token": None,
+            },
             ABI_OVERRIDE,  # expected ABI
         ),
         (
             [CONTRACT, ARGS, NETWORK, ALIAS, PATH_OVERRIDE, ABI_OVERRIDE],  # args
+            {
+                "contract_name": CONTRACT,
+                "inputs": ["1", "2", "3"],
+                "overriding_path": PATH_OVERRIDE,
+                "mainnet_token": None,
+            },
             ABI_OVERRIDE,  # expected ABI
         ),
     ],
 )
 @patch("nile.core.deploy.parse_information", return_value=CALL_OUTPUT)
 @patch("nile.core.deploy.deployments.register")
-async def test_deploy(mock_register, mock_parse, caplog, args, exp_abi):
+async def test_deploy(mock_register, mock_parse, caplog, args, cmd_args, exp_abi):
     logging.getLogger().setLevel(logging.INFO)
 
     with patch("nile.core.deploy.execute_call", new=AsyncMock()) as mock_cli_call:
@@ -65,6 +89,7 @@ async def test_deploy(mock_register, mock_parse, caplog, args, exp_abi):
         # check internals
         mock_parse.assert_called_once_with(CALL_OUTPUT)
         mock_register.assert_called_once_with(ADDRESS, exp_abi, NETWORK, ALIAS)
+        mock_cli_call.assert_called_once_with("deploy", NETWORK, **cmd_args)
 
         # check logs
         assert f"🚀 Deploying {CONTRACT}" in caplog.text

From f33ccc2f9c728441ac0bfb22282e66850ac1cec5 Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Mon, 14 Nov 2022 19:54:10 -0500
Subject: [PATCH 081/109] add comments

---
 tests/commands/test_account.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/commands/test_account.py b/tests/commands/test_account.py
index f5cf5caa..936ead04 100644
--- a/tests/commands/test_account.py
+++ b/tests/commands/test_account.py
@@ -58,15 +58,15 @@ async def test_deploy(mock_path, mock_deploy):
     account = await Account(KEY, NETWORK)
 
     mock_deploy.assert_called_with(
-        "Account",
-        [account.signer.public_key],
-        NETWORK,
-        f"account-{account.index}",
-        (
+        "Account",                          # contract
+        [account.signer.public_key],        # arguments
+        NETWORK,                            # network
+        f"account-{account.index}",         # index
+        (                                   # overriding path
             f"{test_path}/artifacts",
             f"{test_path}/artifacts/abis",
         ),
-        watch_mode=None,
+        watch_mode=None,                    # watch mode
     )
 
 

From fbcef31ebce3e20e4c5097f7106f80d5e5860bbb Mon Sep 17 00:00:00 2001
From: Andrew <fleming-andrew@protonmail.com>
Date: Mon, 14 Nov 2022 19:57:34 -0500
Subject: [PATCH 082/109] remove comments

---
 tests/commands/test_account.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/commands/test_account.py b/tests/commands/test_account.py
index 936ead04..f5cf5caa 100644
--- a/tests/commands/test_account.py
+++ b/tests/commands/test_account.py
@@ -58,15 +58,15 @@ async def test_deploy(mock_path, mock_deploy):
     account = await Account(KEY, NETWORK)
 
     mock_deploy.assert_called_with(
-        "Account",                          # contract
-        [account.signer.public_key],        # arguments
-        NETWORK,                            # network
-        f"account-{account.index}",         # index
-        (                                   # overriding path
+        "Account",
+        [account.signer.public_key],
+        NETWORK,
+        f"account-{account.index}",
+        (
             f"{test_path}/artifacts",
             f"{test_path}/artifacts/abis",
         ),
-        watch_mode=None,                    # watch mode
+        watch_mode=None,
     )
 
 

From 084326d13b3a928a16277937f049cff9b2c6f7b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Triay?= <martriay@gmail.com>
Date: Mon, 14 Nov 2022 23:15:43 -0300
Subject: [PATCH 083/109] fix conflicts. address review comments

---
 src/nile/cli.py          | 10 ++--------
 src/nile/common.py       |  2 --
 src/nile/core/account.py |  7 ++++---
 src/nile/core/deploy.py  |  4 +---
 src/nile/starknet_cli.py | 12 +++++++++++-
 5 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/nile/cli.py b/src/nile/cli.py
index faf28856..a42396de 100644
--- a/src/nile/cli.py
+++ b/src/nile/cli.py
@@ -148,16 +148,10 @@ async def declare(
 @click.option("--salt", nargs=1)
 @click.option("--max_fee", nargs=1)
 @network_option
-<<<<<<< HEAD
-async def setup(signer, network, salt=0, max_fee=None):
-    """Set up an Account contract."""
-    await Account(signer, network, salt=salt, max_fee=max_fee)
-=======
 @watch_option
-async def setup(signer, network, watch_mode):
+async def setup(signer, network, salt, max_fee, watch_mode):
     """Set up an Account contract."""
-    await Account(signer, network, watch_mode=watch_mode)
->>>>>>> replace-subprocess
+    await Account(signer, network, salt, max_fee, watch_mode=watch_mode)
 
 
 @cli.command()
diff --git a/src/nile/common.py b/src/nile/common.py
index b028c837..749b4d9d 100644
--- a/src/nile/common.py
+++ b/src/nile/common.py
@@ -4,10 +4,8 @@
 import re
 
 from starkware.crypto.signature.fast_pedersen_hash import pedersen_hash
-from starkware.starknet.cli.starknet_cli import NETWORKS, assert_tx_received
 from starkware.starknet.core.os.class_hash import compute_class_hash
 from starkware.starknet.services.api.contract_class import ContractClass
-from starkware.starknet.services.api.gateway.gateway_client import GatewayClient
 
 from nile.utils import hex_class_hash, normalize_number, str_to_felt
 
diff --git a/src/nile/core/account.py b/src/nile/core/account.py
index 9c003d8e..661d2919 100644
--- a/src/nile/core/account.py
+++ b/src/nile/core/account.py
@@ -91,7 +91,7 @@ async def __init__(
     async def deploy(
         self,
         salt=0,
-        max_fee=None,
+        max_fee=0,
         query_type=None,
         watch_mode=None
     ):
@@ -100,11 +100,11 @@ async def deploy(
         pt = os.path.dirname(os.path.realpath(__file__)).replace("/core", "")
         overriding_path = (f"{pt}/artifacts", f"{pt}/artifacts/abis")
 
+        salt = normalize_number(salt)
         class_hash = get_hash("Account")
+        max_fee = normalize_number(max_fee)
         calldata = [self.signer.public_key]
 
-        if max_fee is None:
-            max_fee = 0
 
         contract_address = calculate_contract_address_from_hash(
             salt=salt,
@@ -130,6 +130,7 @@ async def deploy(
             max_fee=max_fee,
             query_type=query_type,
             overriding_path=overriding_path,
+            watch_mode=watch_mode,
         )
 
         accounts.register(
diff --git a/src/nile/core/deploy.py b/src/nile/core/deploy.py
index 2b1a10fd..b58fb37d 100644
--- a/src/nile/core/deploy.py
+++ b/src/nile/core/deploy.py
@@ -1,7 +1,6 @@
 """Command to deploy StarkNet smart contracts."""
 import logging
 
-from starkware.starknet.cli import starknet_cli
 from starkware.starknet.services.api.gateway.transaction import DeployAccount
 
 from nile import deployments
@@ -10,12 +9,11 @@
     BUILD_DIRECTORY,
     QUERY_VERSION,
     TRANSACTION_VERSION,
-    get_gateway_response,
     get_hash,
     parse_information,
     prepare_params,
 )
-from nile.starknet_cli import execute_call
+from nile.starknet_cli import execute_call, get_gateway_response
 from nile.utils import hex_address
 from nile.utils.status import status
 
diff --git a/src/nile/starknet_cli.py b/src/nile/starknet_cli.py
index 21d7dfb0..c02a36c3 100644
--- a/src/nile/starknet_cli.py
+++ b/src/nile/starknet_cli.py
@@ -5,7 +5,8 @@
 from types import SimpleNamespace
 
 from starkware.starknet.cli import starknet_cli
-from starkware.starknet.cli.starknet_cli import NETWORKS
+from starkware.starknet.cli.starknet_cli import NETWORKS, assert_tx_received
+from starkware.starknet.services.api.gateway.gateway_client import GatewayClient
 
 from nile.common import ABIS_DIRECTORY, BUILD_DIRECTORY, GATEWAYS
 
@@ -31,6 +32,15 @@ async def execute_call(cmd_name, network, **kwargs):
     return await capture_stdout(cmd(args=args, command_args=command_args))
 
 
+async def get_gateway_response(network, tx, token):
+    """Execute transaction and return response."""
+    gateway_url = get_gateway_url(network)
+    gateway_client = GatewayClient(url=gateway_url)
+    gateway_response = await gateway_client.add_transaction(tx=tx, token=token)
+    assert_tx_received(gateway_response)
+
+    return gateway_response
+
 async def capture_stdout(func):
     """Return the stdout during the passed function call."""
     stdout = sys.stdout

From 43fc96af8e6a197200f4c0dc3fda53851e237741 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Triay?= <martriay@gmail.com>
Date: Mon, 14 Nov 2022 23:16:07 -0300
Subject: [PATCH 084/109] fix linting

---
 src/nile/core/account.py       | 23 ++++++++++++-----------
 src/nile/starknet_cli.py       |  1 +
 tests/commands/test_account.py |  8 +++++++-
 tests/commands/test_deploy.py  |  1 +
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/nile/core/account.py b/src/nile/core/account.py
index 661d2919..442608ff 100644
--- a/src/nile/core/account.py
+++ b/src/nile/core/account.py
@@ -52,7 +52,13 @@ class Account(AsyncObject):
     """
 
     async def __init__(
-        self, signer, network, salt=0, max_fee=None, predeployed_info=None, watch_mode=None
+        self,
+        signer,
+        network,
+        salt=0,
+        max_fee=None,
+        predeployed_info=None,
+        watch_mode=None,
     ):
         """Get or deploy an Account contract for the given private key."""
         try:
@@ -84,17 +90,13 @@ async def __init__(
             self.address = signer_data["address"]
             self.index = signer_data["index"]
         else:
-            address, index = await self.deploy(salt=salt, max_fee=max_fee, watch_mode=watch_mode)
+            address, index = await self.deploy(
+                salt=salt, max_fee=max_fee, watch_mode=watch_mode
+            )
             self.address = address
             self.index = index
 
-    async def deploy(
-        self,
-        salt=0,
-        max_fee=0,
-        query_type=None,
-        watch_mode=None
-    ):
+    async def deploy(self, salt=0, max_fee=0, query_type=None, watch_mode=None):
         """Deploy an Account contract for the given private key."""
         index = accounts.current_index(self.network)
         pt = os.path.dirname(os.path.realpath(__file__)).replace("/core", "")
@@ -105,7 +107,6 @@ async def deploy(
         max_fee = normalize_number(max_fee)
         calldata = [self.signer.public_key]
 
-
         contract_address = calculate_contract_address_from_hash(
             salt=salt,
             class_hash=class_hash,
@@ -119,7 +120,7 @@ async def deploy(
             calldata,
             salt,
             max_fee,
-            0, # nonce starts at 0
+            0,  # nonce starts at 0
         )
 
         address, _ = await deploy_account(
diff --git a/src/nile/starknet_cli.py b/src/nile/starknet_cli.py
index c02a36c3..874a3af4 100644
--- a/src/nile/starknet_cli.py
+++ b/src/nile/starknet_cli.py
@@ -41,6 +41,7 @@ async def get_gateway_response(network, tx, token):
 
     return gateway_response
 
+
 async def capture_stdout(func):
     """Return the stdout during the passed function call."""
     stdout = sys.stdout
diff --git a/tests/commands/test_account.py b/tests/commands/test_account.py
index c31008d3..0b5ebdf2 100644
--- a/tests/commands/test_account.py
+++ b/tests/commands/test_account.py
@@ -296,7 +296,13 @@ async def test_simulate(mock_hash, mock_deploy):
 @patch("nile.core.account.get_nonce", return_value=0)
 @patch("nile.core.account.call_or_invoke")
 async def test_execute_query(
-    mock_call, mock_nonce, mock_target_address, mock_hash, mock_deploy, watch_mode, query_type
+    mock_call,
+    mock_nonce,
+    mock_target_address,
+    mock_hash,
+    mock_deploy,
+    watch_mode,
+    query_type,
 ):
     account = await Account(KEY, NETWORK)
 
diff --git a/tests/commands/test_deploy.py b/tests/commands/test_deploy.py
index b13c6584..3b081127 100644
--- a/tests/commands/test_deploy.py
+++ b/tests/commands/test_deploy.py
@@ -32,6 +32,7 @@ def tmp_working_dir(monkeypatch, tmp_path):
 FEE = 666
 CALL_OUTPUT = [ADDRESS, TX_HASH]
 
+
 @pytest.mark.asyncio
 @pytest.mark.parametrize(
     "args, cmd_args, exp_abi",

From 574a442e8700894f7cf277532e12bc1bbfa657c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Triay?= <martriay@gmail.com>
Date: Thu, 17 Nov 2022 16:50:17 -0300
Subject: [PATCH 085/109] fix merge

---
 src/nile/core/account.py         |  4 ++--
 src/nile/starknet_cli.py         |  1 -
 tests/commands/test_deploy.py    |  1 +
 tests/commands/test_get_nonce.py |  1 +
 tests/test_starknet_cli.py       | 12 +++++++++---
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/nile/core/account.py b/src/nile/core/account.py
index 84b5ef37..788fe253 100644
--- a/src/nile/core/account.py
+++ b/src/nile/core/account.py
@@ -96,7 +96,7 @@ async def __init__(
             self.address = address
             self.index = index
 
-    async def deploy(self, salt=0, max_fee=0, query_type=None, watch_mode=None):
+    async def deploy(self, salt=0, max_fee=None, query_type=None, watch_mode=None):
         """Deploy an Account contract for the given private key."""
         index = accounts.current_index(self.network)
         pt = os.path.dirname(os.path.realpath(__file__)).replace("/core", "")
@@ -104,7 +104,7 @@ async def deploy(self, salt=0, max_fee=0, query_type=None, watch_mode=None):
 
         salt = normalize_number(salt)
         class_hash = get_hash("Account")
-        max_fee = normalize_number(max_fee)
+        max_fee = 0 if max_fee is None else normalize_number(max_fee)
         calldata = [self.signer.public_key]
 
         contract_address = calculate_contract_address_from_hash(
diff --git a/src/nile/starknet_cli.py b/src/nile/starknet_cli.py
index 3edc8a8c..1d0cb391 100644
--- a/src/nile/starknet_cli.py
+++ b/src/nile/starknet_cli.py
@@ -8,7 +8,6 @@
 from starkware.starknet.cli import starknet_cli
 from starkware.starknet.cli.starknet_cli import NETWORKS, assert_tx_received
 from starkware.starknet.services.api.gateway.gateway_client import GatewayClient
-from starkware.starknet.cli.starknet_cli import NETWORKS
 
 from nile.common import ABIS_DIRECTORY, BUILD_DIRECTORY, GATEWAYS, prepare_params
 
diff --git a/tests/commands/test_deploy.py b/tests/commands/test_deploy.py
index f2d340f0..22757e5f 100644
--- a/tests/commands/test_deploy.py
+++ b/tests/commands/test_deploy.py
@@ -33,6 +33,7 @@ def tmp_working_dir(monkeypatch, tmp_path):
 FEE = 666
 CALL_OUTPUT = [ADDRESS, TX_HASH]
 
+
 @pytest.mark.asyncio
 @pytest.mark.parametrize(
     "args, cmd_args, exp_abi",
diff --git a/tests/commands/test_get_nonce.py b/tests/commands/test_get_nonce.py
index 972a6bb6..3ee3ac23 100644
--- a/tests/commands/test_get_nonce.py
+++ b/tests/commands/test_get_nonce.py
@@ -29,6 +29,7 @@ async def test_get_nonce(contract_address, network, caplog):
         # Check log
         assert f"Current Nonce: {NONCE}" in caplog.text
 
+
 @pytest.mark.asyncio
 @pytest.mark.parametrize(
     "contract_address",
diff --git a/tests/test_starknet_cli.py b/tests/test_starknet_cli.py
index e8be024a..77e2195f 100644
--- a/tests/test_starknet_cli.py
+++ b/tests/test_starknet_cli.py
@@ -66,12 +66,18 @@ def test__add_args(args, expected):
     "args, expected",
     [
         (
-            {"inputs": INPUTS, "address": ADDRESS},
-            ["--inputs", "1", "2", "--address", ADDRESS],
+            {"address": ADDRESS, "inputs": INPUTS},
+            ["--address", ADDRESS, "--inputs", "1", "2"],
         ),
         (
             {"inputs": INPUTS, "contract_name": CONTRACT_NAME},
-            ["--inputs", "1", "2", "--contract", f"artifacts/{CONTRACT_NAME}.json"],
+            [
+                "--contract",
+                f"artifacts/{CONTRACT_NAME}.json",
+                "--inputs",
+                "1",
+                "2",
+            ],
         ),
         (
             {"method": "METHOD", "query_flag": "simulate"},

From 7802f730c4be33b0a04521928fed9d66efa271c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Triay?= <martriay@gmail.com>
Date: Thu, 17 Nov 2022 17:46:25 -0300
Subject: [PATCH 086/109] add gateway response tests

---
 tests/commands/test_deploy.py |  4 +---
 tests/test_starknet_cli.py    | 40 ++++++++++++++++++++++++++++++++++-
 tox.ini                       |  4 ++--
 3 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/tests/commands/test_deploy.py b/tests/commands/test_deploy.py
index 22757e5f..a71ff83c 100644
--- a/tests/commands/test_deploy.py
+++ b/tests/commands/test_deploy.py
@@ -27,11 +27,9 @@ def tmp_working_dir(monkeypatch, tmp_path):
 ADDRESS = 999
 TX_HASH = 222
 CALL_OUTPUT = [ADDRESS, TX_HASH]
-
-SALT = 555
 SIGNATURE = [111, 333]
+SALT = 555
 FEE = 666
-CALL_OUTPUT = [ADDRESS, TX_HASH]
 
 
 @pytest.mark.asyncio
diff --git a/tests/test_starknet_cli.py b/tests/test_starknet_cli.py
index 77e2195f..ef143876 100644
--- a/tests/test_starknet_cli.py
+++ b/tests/test_starknet_cli.py
@@ -1,13 +1,15 @@
 """Tests for starknet_cli module."""
 from types import SimpleNamespace
-from unittest.mock import MagicMock, patch
+from unittest.mock import AsyncMock, MagicMock, patch
 
 import pytest
+from starkware.starkware_utils.error_handling import StarkErrorCode
 
 from nile.starknet_cli import (
     _add_args,
     capture_stdout,
     get_feeder_url,
+    get_gateway_response,
     get_gateway_url,
     set_command_args,
     set_context,
@@ -20,6 +22,9 @@
 STDOUT_1 = "SDTOUT_1"
 STDOUT_2 = "SDTOUT_2"
 
+TX_RECEIVED = dict({"code": StarkErrorCode.TRANSACTION_RECEIVED.name, "result": "test"})
+TX_FAILED = dict({"code": "test"})
+
 
 @pytest.mark.parametrize(
     "network, url",
@@ -133,6 +138,39 @@ def test_get_feeder_url(network, expected):
         assert url == expected
 
 
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "success, tx_response",
+    [
+        (False, TX_FAILED),
+        (True, TX_RECEIVED),
+    ],
+)
+@patch("nile.core.deploy.DeployAccount")
+async def test_get_gateway_response(mock_tx, success, tx_response):
+    with patch(
+        "nile.starknet_cli.GatewayClient.add_transaction", new=AsyncMock()
+    ) as mock_client:
+        mock_client.return_value = tx_response
+        args = dict({"network": NETWORK, "tx": mock_tx, "token": None})
+
+        if success:
+            # success
+            res = await get_gateway_response(**args)
+            assert res == tx_response
+
+        else:
+            mock_client.return_value = tx_response
+
+            with pytest.raises(BaseException) as err:
+                await get_gateway_response(**args)
+            assert "Failed to send transaction. Response: {'code': 'test'}." in str(
+                err.value
+            )
+
+        mock_client.assert_called_once_with(tx=mock_tx, token=None)
+
+
 @pytest.mark.asyncio
 async def test_capture_stdout():
     async def helper():
diff --git a/tox.ini b/tox.ini
index 447ffe8f..06fd60e6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,10 +14,10 @@ passenv =
 extras =
     testing
 deps =
-    cairo-lang==0.10.1
-    starknet-devnet==0.3.5
     anyio>=3.6.1
     asyncclick>=8.1.3.4
+    cairo-lang==0.10.1
+    starknet-devnet==0.3.5
     # See https://github.com/starkware-libs/cairo-lang/issues/52
     marshmallow-dataclass==8.5.3
 commands =

From f4afd8eb933f8c3b0bb65642aa96a713e2603b3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Triay?= <martriay@gmail.com>
Date: Thu, 17 Nov 2022 18:04:44 -0300
Subject: [PATCH 087/109] update account artifacts w/vali_deploy

---
 src/nile/artifacts/Account.json      | 5431 +++++++++++++++++---------
 src/nile/artifacts/abis/Account.json |   19 +
 2 files changed, 3591 insertions(+), 1859 deletions(-)

diff --git a/src/nile/artifacts/Account.json b/src/nile/artifacts/Account.json
index fccdecb0..3062816c 100644
--- a/src/nile/artifacts/Account.json
+++ b/src/nile/artifacts/Account.json
@@ -137,6 +137,25 @@
             "outputs": [],
             "type": "function"
         },
+        {
+            "inputs": [
+                {
+                    "name": "class_hash",
+                    "type": "felt"
+                },
+                {
+                    "name": "salt",
+                    "type": "felt"
+                },
+                {
+                    "name": "publicKey",
+                    "type": "felt"
+                }
+            ],
+            "name": "__validate_deploy__",
+            "outputs": [],
+            "type": "function"
+        },
         {
             "inputs": [
                 {
@@ -183,7 +202,7 @@
                 "selector": "0xbc0eb87884ab91e330445c3584a50d7ddf4b568f02fbeb456a6242cce3f5d9"
             },
             {
-                "offset": "0x293",
+                "offset": "0x2bb",
                 "selector": "0x15d40a3d6ca2ac30f4031e42be28da9b056fef9bb7357ac5e85627ee876e5ad"
             },
             {
@@ -205,6 +224,10 @@
             {
                 "offset": "0x1b2",
                 "selector": "0x29e211664c0b63c79638fbea474206ca74016b3e9a3dc4f9ac300ffd8bdf2cd"
+            },
+            {
+                "offset": "0x285",
+                "selector": "0x36fcbf06cd96843058359e1a75928beacfac10727dab22a3972f0af8aa92895"
             }
         ],
         "L1_HANDLER": []
@@ -272,7 +295,7 @@
             "ecdsa",
             "bitwise"
         ],
-        "compiler_version": "0.10.0",
+        "compiler_version": "0.10.1",
         "data": [
             "0x40780017fff7fff",
             "0x1",
@@ -902,6 +925,46 @@
             "0x0",
             "0x48127ff97fff8000",
             "0x208b7fff7fff7ffe",
+            "0x480a7ff77fff8000",
+            "0x1104800180018000",
+            "0x800000000000010fffffffffffffffffffffffffffffffffffffffffffffe00",
+            "0x48127ffe7fff8000",
+            "0x480a7ff87fff8000",
+            "0x480a7ff97fff8000",
+            "0x480a7ffa7fff8000",
+            "0x480080057ffb8000",
+            "0x480080037ffa8000",
+            "0x480080047ff98000",
+            "0x1104800180018000",
+            "0x800000000000010fffffffffffffffffffffffffffffffffffffffffffffe6e",
+            "0x48127ffb7fff8000",
+            "0x48127ffb7fff8000",
+            "0x48127ffb7fff8000",
+            "0x48127ffb7fff8000",
+            "0x208b7fff7fff7ffe",
+            "0x482680017ffd8000",
+            "0x3",
+            "0x402a7ffd7ffc7fff",
+            "0x480280007ffb8000",
+            "0x480280017ffb8000",
+            "0x480280037ffb8000",
+            "0x480280027ffb8000",
+            "0x480280007ffd8000",
+            "0x480280017ffd8000",
+            "0x480280027ffd8000",
+            "0x1104800180018000",
+            "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffffe6",
+            "0x40780017fff7fff",
+            "0x1",
+            "0x48127ffb7fff8000",
+            "0x48127ffb7fff8000",
+            "0x48127ffc7fff8000",
+            "0x48127ffa7fff8000",
+            "0x480280047ffb8000",
+            "0x480680017fff8000",
+            "0x0",
+            "0x48127ff97fff8000",
+            "0x208b7fff7fff7ffe",
             "0x480a7ff57fff8000",
             "0x480a7ff67fff8000",
             "0x480a7ff77fff8000",
@@ -912,7 +975,7 @@
             "0x480a7ffc7fff8000",
             "0x480a7ffd7fff8000",
             "0x1104800180018000",
-            "0x800000000000010fffffffffffffffffffffffffffffffffffffffffffffe82",
+            "0x800000000000010fffffffffffffffffffffffffffffffffffffffffffffe5a",
             "0x208b7fff7fff7ffe",
             "0x40780017fff7fff",
             "0x3",
@@ -928,7 +991,7 @@
             "0x480a7ffc7fff8000",
             "0x480a7ffb7fff8000",
             "0x1104800180018000",
-            "0x800000000000010fffffffffffffffffffffffffffffffffffffffffffffd77",
+            "0x800000000000010fffffffffffffffffffffffffffffffffffffffffffffd4f",
             "0x480a80017fff8000",
             "0x4829800080008002",
             "0x480a80007fff8000",
@@ -999,6 +1062,7 @@
                 "autogen/starknet/arg_processor/b07888c526f97925bd7037f4dcde235d5ffb2d92354828348c217678c2166713.cairo": "let __calldata_arg_hash = [__calldata_ptr];\nlet __calldata_ptr = __calldata_ptr + 1;\n",
                 "autogen/starknet/arg_processor/b3680ca562908399dc897f0a23ed55686e0fba9ab4a18330c139e561aa7b41d8.cairo": "let __calldata_arg_calldata_len = [__calldata_ptr];\nlet __calldata_ptr = __calldata_ptr + 1;\n",
                 "autogen/starknet/arg_processor/b929869545548e90b3e0972d942496bfe6c38d7ef8c117fc5015fd8f5ae5ede3.cairo": "// Check that the length is non-negative.\nassert [range_check_ptr] = ret_value.response_len;\n// Store the updated range_check_ptr as a local variable to keep it available after\n// the memcpy.\nlocal range_check_ptr = range_check_ptr + 1;\n// Keep a reference to __return_value_ptr.\nlet __return_value_ptr_copy = __return_value_ptr;\n// Store the updated __return_value_ptr as a local variable to keep it available after\n// the memcpy.\nlocal __return_value_ptr: felt* = __return_value_ptr + ret_value.response_len * 1;\nmemcpy(\n    dst=__return_value_ptr_copy,\n    src=ret_value.response,\n    len=ret_value.response_len * 1);\n",
+                "autogen/starknet/arg_processor/ba1d9ba0c2820d7cb2df6f2f4aeae34ef8b189c7149c4a757e99674aa5743013.cairo": "let __calldata_arg_salt = [__calldata_ptr];\nlet __calldata_ptr = __calldata_ptr + 1;\n",
                 "autogen/starknet/arg_processor/c2f1fff90123af1ac991a5f7ea9000b626c118903b694b399e02806d44fb5def.cairo": "assert [__return_value_ptr] = ret_value.response_len;\nlet __return_value_ptr = __return_value_ptr + 1;\n",
                 "autogen/starknet/arg_processor/c31620b02d4d706f0542c989b2aadc01b0981d1f6a5933a8fe4937ace3d70d92.cairo": "let __calldata_actual_size =  __calldata_ptr - cast([cast(fp + (-3), felt**)], felt*);\n",
                 "autogen/starknet/arg_processor/e0103dcf78458048e6a2fbe82ac74a16ee35839175ed068cc53ace2ff3c8d843.cairo": "let __calldata_arg_publicKey = [__calldata_ptr];\nlet __calldata_ptr = __calldata_ptr + 1;\n",
@@ -1025,6 +1089,13 @@
                 "autogen/starknet/external/__validate_declare__/aeb171d2cc305f87c40b0407565ecdd1a4c396c46cd94f15ca0069e15eab01ed.cairo": "let ret_value = __wrapped_func{syscall_ptr=syscall_ptr, pedersen_ptr=pedersen_ptr, ecdsa_ptr=ecdsa_ptr, range_check_ptr=range_check_ptr}(class_hash=__calldata_arg_class_hash,);\n%{ memory[ap] = segments.add() %}        // Allocate memory for return value.\ntempvar retdata: felt*;\nlet retdata_size = 0;\n",
                 "autogen/starknet/external/__validate_declare__/b2c52ca2d2a8fc8791a983086d8716c5eacd0c3d62934914d2286f84b98ff4cb.cairo": "let syscall_ptr = [cast([cast(fp + (-5), felt**)] + 0, felt**)];\n",
                 "autogen/starknet/external/__validate_declare__/b363de5c884e054e373732fa94161084d4128000eba968c31dbb40d4ab78ae25.cairo": "return (syscall_ptr,pedersen_ptr,range_check_ptr,ecdsa_ptr,bitwise_ptr,retdata_size,retdata);\n",
+                "autogen/starknet/external/__validate_deploy__/2e2c5536af4c3ea88b562852f6f3740af166f645e0f066972184481010fe04da.cairo": "let bitwise_ptr = [cast([cast(fp + (-5), felt**)] + 4, felt*)];\n",
+                "autogen/starknet/external/__validate_deploy__/741ea357d6336b0bed7bf0472425acd0311d543883b803388880e60a232040c7.cairo": "let range_check_ptr = [cast([cast(fp + (-5), felt**)] + 2, felt*)];\n",
+                "autogen/starknet/external/__validate_deploy__/848b6f2a8b49060747719a7d39d6d2fa962bc14d0633409ac194aa41364c7768.cairo": "let ret_value = __wrapped_func{syscall_ptr=syscall_ptr, pedersen_ptr=pedersen_ptr, ecdsa_ptr=ecdsa_ptr, range_check_ptr=range_check_ptr}(class_hash=__calldata_arg_class_hash, salt=__calldata_arg_salt, publicKey=__calldata_arg_publicKey,);\n%{ memory[ap] = segments.add() %}        // Allocate memory for return value.\ntempvar retdata: felt*;\nlet retdata_size = 0;\n",
+                "autogen/starknet/external/__validate_deploy__/9684a85e93c782014ca14293edea4eb2502039a5a7b6538ecd39c56faaf12529.cairo": "let pedersen_ptr = [cast([cast(fp + (-5), felt**)] + 1, starkware.cairo.common.cairo_builtins.HashBuiltin**)];\n",
+                "autogen/starknet/external/__validate_deploy__/972efe4adb0e1cedbdf0f0747cf1e121111a6180229de74773d49a6e595c4f3d.cairo": "let ecdsa_ptr = [cast([cast(fp + (-5), felt**)] + 3, starkware.cairo.common.cairo_builtins.SignatureBuiltin**)];\n",
+                "autogen/starknet/external/__validate_deploy__/b2c52ca2d2a8fc8791a983086d8716c5eacd0c3d62934914d2286f84b98ff4cb.cairo": "let syscall_ptr = [cast([cast(fp + (-5), felt**)] + 0, felt**)];\n",
+                "autogen/starknet/external/__validate_deploy__/b363de5c884e054e373732fa94161084d4128000eba968c31dbb40d4ab78ae25.cairo": "return (syscall_ptr,pedersen_ptr,range_check_ptr,ecdsa_ptr,bitwise_ptr,retdata_size,retdata);\n",
                 "autogen/starknet/external/constructor/2e2c5536af4c3ea88b562852f6f3740af166f645e0f066972184481010fe04da.cairo": "let bitwise_ptr = [cast([cast(fp + (-5), felt**)] + 4, felt*)];\n",
                 "autogen/starknet/external/constructor/741ea357d6336b0bed7bf0472425acd0311d543883b803388880e60a232040c7.cairo": "let range_check_ptr = [cast([cast(fp + (-5), felt**)] + 2, felt*)];\n",
                 "autogen/starknet/external/constructor/85878491738bbe4da46aa469fbd2786d48e333915f5f6757828b7b21676593c8.cairo": "let ret_value = __wrapped_func{syscall_ptr=syscall_ptr, pedersen_ptr=pedersen_ptr, range_check_ptr=range_check_ptr}(publicKey=__calldata_arg_publicKey,);\n%{ memory[ap] = segments.add() %}        // Allocate memory for return value.\ntempvar retdata: felt*;\nlet retdata_size = 0;\n",
@@ -1080,7 +1151,7 @@
                                 "end_col": 38,
                                 "end_line": 3,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/alloc.cairo"
+                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/alloc.cairo"
                                 },
                                 "start_col": 5,
                                 "start_line": 3
@@ -1092,7 +1163,7 @@
                         "end_col": 12,
                         "end_line": 4,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/alloc.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/alloc.cairo"
                         },
                         "start_col": 5,
                         "start_line": 4
@@ -1109,7 +1180,7 @@
                         "end_col": 40,
                         "end_line": 5,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/alloc.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/alloc.cairo"
                         },
                         "start_col": 5,
                         "start_line": 5
@@ -1126,7 +1197,7 @@
                         "end_col": 7,
                         "end_line": 8,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/memcpy.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/memcpy.cairo"
                         },
                         "start_col": 5,
                         "start_line": 8
@@ -1143,7 +1214,7 @@
                         "end_col": 19,
                         "end_line": 9,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/memcpy.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/memcpy.cairo"
                         },
                         "start_col": 9,
                         "start_line": 9
@@ -1161,7 +1232,7 @@
                                 "end_col": 41,
                                 "end_line": 12,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/memcpy.cairo"
+                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/memcpy.cairo"
                                 },
                                 "start_col": 5,
                                 "start_line": 12
@@ -1173,14 +1244,14 @@
                         "end_col": 23,
                         "end_line": 2,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/memcpy.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/memcpy.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 38,
                                 "end_line": 13,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/memcpy.cairo"
+                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/memcpy.cairo"
                                 },
                                 "start_col": 35,
                                 "start_line": 13
@@ -1202,14 +1273,14 @@
                         "end_col": 35,
                         "end_line": 2,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/memcpy.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/memcpy.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 47,
                                 "end_line": 13,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/memcpy.cairo"
+                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/memcpy.cairo"
                                 },
                                 "start_col": 44,
                                 "start_line": 13
@@ -1231,7 +1302,7 @@
                         "end_col": 37,
                         "end_line": 17,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/memcpy.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/memcpy.cairo"
                         },
                         "start_col": 26,
                         "start_line": 17
@@ -1248,7 +1319,7 @@
                         "end_col": 38,
                         "end_line": 17,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/memcpy.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/memcpy.cairo"
                         },
                         "start_col": 5,
                         "start_line": 17
@@ -1265,7 +1336,7 @@
                         "end_col": 41,
                         "end_line": 22,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/memcpy.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/memcpy.cairo"
                         },
                         "start_col": 5,
                         "start_line": 22
@@ -1282,7 +1353,7 @@
                         "end_col": 41,
                         "end_line": 23,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/memcpy.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/memcpy.cairo"
                         },
                         "start_col": 5,
                         "start_line": 23
@@ -1300,7 +1371,7 @@
                                 "end_col": 7,
                                 "end_line": 27,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/memcpy.cairo"
+                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/memcpy.cairo"
                                 },
                                 "start_col": 5,
                                 "start_line": 24
@@ -1312,7 +1383,7 @@
                         "end_col": 44,
                         "end_line": 29,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/memcpy.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/memcpy.cairo"
                         },
                         "start_col": 5,
                         "start_line": 29
@@ -1329,7 +1400,7 @@
                         "end_col": 55,
                         "end_line": 31,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/memcpy.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/memcpy.cairo"
                         },
                         "start_col": 5,
                         "start_line": 31
@@ -1347,7 +1418,7 @@
                                 "end_col": 26,
                                 "end_line": 33,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/memcpy.cairo"
+                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/memcpy.cairo"
                                 },
                                 "start_col": 5,
                                 "start_line": 33
@@ -1359,7 +1430,7 @@
                         "end_col": 15,
                         "end_line": 34,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/memcpy.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/memcpy.cairo"
                         },
                         "start_col": 5,
                         "start_line": 34
@@ -1377,7 +1448,7 @@
                                 "end_col": 7,
                                 "end_line": 184,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                                 },
                                 "start_col": 5,
                                 "start_line": 164
@@ -1389,7 +1460,7 @@
                         "end_col": 42,
                         "end_line": 186,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                         },
                         "start_col": 25,
                         "start_line": 186
@@ -1406,7 +1477,7 @@
                         "end_col": 66,
                         "end_line": 186,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                         },
                         "start_col": 45,
                         "start_line": 186
@@ -1423,7 +1494,7 @@
                         "end_col": 86,
                         "end_line": 186,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                         },
                         "start_col": 45,
                         "start_line": 186
@@ -1440,7 +1511,7 @@
                         "end_col": 86,
                         "end_line": 186,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                         },
                         "start_col": 25,
                         "start_line": 186
@@ -1457,7 +1528,7 @@
                         "end_col": 45,
                         "end_line": 187,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                         },
                         "start_col": 24,
                         "start_line": 187
@@ -1474,7 +1545,7 @@
                         "end_col": 69,
                         "end_line": 187,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                         },
                         "start_col": 48,
                         "start_line": 187
@@ -1491,7 +1562,7 @@
                         "end_col": 89,
                         "end_line": 187,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                         },
                         "start_col": 48,
                         "start_line": 187
@@ -1508,7 +1579,7 @@
                         "end_col": 89,
                         "end_line": 187,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                         },
                         "start_col": 24,
                         "start_line": 187
@@ -1526,7 +1597,7 @@
                                 "end_col": 49,
                                 "end_line": 196,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                                 },
                                 "start_col": 5,
                                 "start_line": 196
@@ -1538,7 +1609,7 @@
                         "end_col": 42,
                         "end_line": 197,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                         },
                         "start_col": 5,
                         "start_line": 197
@@ -1555,7 +1626,7 @@
                         "end_col": 25,
                         "end_line": 198,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                         },
                         "start_col": 23,
                         "start_line": 198
@@ -1572,7 +1643,7 @@
                         "end_col": 30,
                         "end_line": 198,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                         },
                         "start_col": 22,
                         "start_line": 198
@@ -1589,7 +1660,7 @@
                         "end_col": 31,
                         "end_line": 198,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                         },
                         "start_col": 5,
                         "start_line": 198
@@ -1606,7 +1677,7 @@
                         "end_col": 29,
                         "end_line": 199,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                         },
                         "start_col": 24,
                         "start_line": 199
@@ -1623,7 +1694,7 @@
                         "end_col": 39,
                         "end_line": 199,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                         },
                         "start_col": 34,
                         "start_line": 199
@@ -1640,7 +1711,7 @@
                         "end_col": 40,
                         "end_line": 199,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                         },
                         "start_col": 23,
                         "start_line": 199
@@ -1657,7 +1728,7 @@
                         "end_col": 41,
                         "end_line": 199,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                         },
                         "start_col": 5,
                         "start_line": 199
@@ -1674,21 +1745,21 @@
                         "end_col": 46,
                         "end_line": 188,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 36,
                                 "end_line": 154,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 15,
                                         "end_line": 200,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                                         },
                                         "start_col": 5,
                                         "start_line": 200
@@ -1715,7 +1786,7 @@
                         "end_col": 15,
                         "end_line": 200,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                         },
                         "start_col": 5,
                         "start_line": 200
@@ -1733,7 +1804,7 @@
                                 "end_col": 49,
                                 "end_line": 204,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                                 },
                                 "start_col": 5,
                                 "start_line": 204
@@ -1745,7 +1816,7 @@
                         "end_col": 50,
                         "end_line": 205,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                         },
                         "start_col": 5,
                         "start_line": 205
@@ -1762,7 +1833,7 @@
                         "end_col": 23,
                         "end_line": 206,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                         },
                         "start_col": 21,
                         "start_line": 206
@@ -1779,7 +1850,7 @@
                         "end_col": 28,
                         "end_line": 206,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                         },
                         "start_col": 20,
                         "start_line": 206
@@ -1796,7 +1867,7 @@
                         "end_col": 30,
                         "end_line": 207,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                         },
                         "start_col": 22,
                         "start_line": 207
@@ -1813,7 +1884,7 @@
                         "end_col": 31,
                         "end_line": 207,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                         },
                         "start_col": 5,
                         "start_line": 207
@@ -1830,7 +1901,7 @@
                         "end_col": 31,
                         "end_line": 208,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                         },
                         "start_col": 23,
                         "start_line": 208
@@ -1847,7 +1918,7 @@
                         "end_col": 32,
                         "end_line": 208,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                         },
                         "start_col": 5,
                         "start_line": 208
@@ -1864,21 +1935,21 @@
                         "end_col": 46,
                         "end_line": 188,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 36,
                                 "end_line": 154,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 15,
                                         "end_line": 209,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                                         },
                                         "start_col": 5,
                                         "start_line": 209
@@ -1905,7 +1976,7 @@
                         "end_col": 15,
                         "end_line": 209,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                         },
                         "start_col": 5,
                         "start_line": 209
@@ -1923,7 +1994,7 @@
                                 "end_col": 31,
                                 "end_line": 213,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                                 },
                                 "start_col": 5,
                                 "start_line": 213
@@ -1935,7 +2006,7 @@
                         "end_col": 24,
                         "end_line": 214,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                         },
                         "start_col": 5,
                         "start_line": 214
@@ -1952,7 +2023,7 @@
                         "end_col": 33,
                         "end_line": 215,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                         },
                         "start_col": 28,
                         "start_line": 215
@@ -1969,7 +2040,7 @@
                         "end_col": 34,
                         "end_line": 215,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                         },
                         "start_col": 23,
                         "start_line": 215
@@ -1986,7 +2057,7 @@
                         "end_col": 35,
                         "end_line": 215,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                         },
                         "start_col": 5,
                         "start_line": 215
@@ -2003,7 +2074,7 @@
                         "end_col": 12,
                         "end_line": 216,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                         },
                         "start_col": 5,
                         "start_line": 216
@@ -2020,21 +2091,21 @@
                         "end_col": 46,
                         "end_line": 188,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 36,
                                 "end_line": 154,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 15,
                                         "end_line": 217,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                                         },
                                         "start_col": 5,
                                         "start_line": 217
@@ -2061,7 +2132,7 @@
                         "end_col": 15,
                         "end_line": 217,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                         },
                         "start_col": 5,
                         "start_line": 217
@@ -2079,7 +2150,7 @@
                                 "end_col": 7,
                                 "end_line": 230,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                                 },
                                 "start_col": 5,
                                 "start_line": 224
@@ -2091,7 +2162,7 @@
                         "end_col": 15,
                         "end_line": 231,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                         },
                         "start_col": 9,
                         "start_line": 231
@@ -2108,7 +2179,7 @@
                         "end_col": 7,
                         "end_line": 231,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                         },
                         "start_col": 5,
                         "start_line": 231
@@ -2125,7 +2196,7 @@
                         "end_col": 18,
                         "end_line": 233,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                         },
                         "start_col": 9,
                         "start_line": 233
@@ -2142,21 +2213,21 @@
                         "end_col": 36,
                         "end_line": 223,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 36,
                                 "end_line": 154,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 25,
                                         "end_line": 235,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                                         },
                                         "start_col": 5,
                                         "start_line": 235
@@ -2183,14 +2254,14 @@
                         "end_col": 39,
                         "end_line": 223,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 21,
                                 "end_line": 235,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                                 },
                                 "start_col": 20,
                                 "start_line": 235
@@ -2212,14 +2283,14 @@
                         "end_col": 42,
                         "end_line": 223,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 24,
                                 "end_line": 235,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                                 },
                                 "start_col": 23,
                                 "start_line": 235
@@ -2241,7 +2312,7 @@
                         "end_col": 25,
                         "end_line": 235,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                         },
                         "start_col": 5,
                         "start_line": 235
@@ -2258,7 +2329,7 @@
                         "end_col": 15,
                         "end_line": 236,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                         },
                         "start_col": 5,
                         "start_line": 236
@@ -2275,7 +2346,7 @@
                         "end_col": 40,
                         "end_line": 47,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 18,
                         "start_line": 47
@@ -2292,7 +2363,7 @@
                         "end_col": 28,
                         "end_line": 51,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 5,
                         "start_line": 46
@@ -2309,7 +2380,7 @@
                         "end_col": 28,
                         "end_line": 51,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 5,
                         "start_line": 46
@@ -2326,7 +2397,7 @@
                         "end_col": 28,
                         "end_line": 51,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 5,
                         "start_line": 46
@@ -2343,7 +2414,7 @@
                         "end_col": 28,
                         "end_line": 51,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 5,
                         "start_line": 46
@@ -2360,7 +2431,7 @@
                         "end_col": 28,
                         "end_line": 51,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 5,
                         "start_line": 46
@@ -2378,7 +2449,7 @@
                                 "end_col": 88,
                                 "end_line": 52,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                                 },
                                 "start_col": 5,
                                 "start_line": 52
@@ -2390,21 +2461,21 @@
                         "end_col": 54,
                         "end_line": 55,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 38,
                                 "end_line": 42,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 75,
                                         "end_line": 56,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                                         },
                                         "start_col": 5,
                                         "start_line": 56
@@ -2431,7 +2502,7 @@
                         "end_col": 47,
                         "end_line": 56,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 26,
                         "start_line": 56
@@ -2448,7 +2519,7 @@
                         "end_col": 73,
                         "end_line": 56,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 57,
                         "start_line": 56
@@ -2465,7 +2536,7 @@
                         "end_col": 75,
                         "end_line": 56,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 5,
                         "start_line": 56
@@ -2482,7 +2553,7 @@
                         "end_col": 90,
                         "end_line": 198,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 63,
                         "start_line": 198
@@ -2499,7 +2570,7 @@
                         "end_col": 92,
                         "end_line": 198,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 5,
                         "start_line": 198
@@ -2517,7 +2588,7 @@
                                 "end_col": 93,
                                 "end_line": 199,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                                 },
                                 "start_col": 5,
                                 "start_line": 199
@@ -2529,21 +2600,21 @@
                         "end_col": 58,
                         "end_line": 200,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 43,
                                 "end_line": 196,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 61,
                                         "end_line": 201,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                                         },
                                         "start_col": 5,
                                         "start_line": 201
@@ -2570,7 +2641,7 @@
                         "end_col": 59,
                         "end_line": 201,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 28,
                         "start_line": 201
@@ -2587,7 +2658,7 @@
                         "end_col": 61,
                         "end_line": 201,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 5,
                         "start_line": 201
@@ -2604,7 +2675,7 @@
                         "end_col": 94,
                         "end_line": 272,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 65,
                         "start_line": 272
@@ -2621,7 +2692,7 @@
                         "end_col": 96,
                         "end_line": 272,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 5,
                         "start_line": 272
@@ -2639,7 +2710,7 @@
                                 "end_col": 95,
                                 "end_line": 273,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                                 },
                                 "start_col": 5,
                                 "start_line": 273
@@ -2651,21 +2722,21 @@
                         "end_col": 60,
                         "end_line": 274,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 45,
                                 "end_line": 270,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 65,
                                         "end_line": 275,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                                         },
                                         "start_col": 5,
                                         "start_line": 275
@@ -2692,7 +2763,7 @@
                         "end_col": 63,
                         "end_line": 275,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 30,
                         "start_line": 275
@@ -2709,7 +2780,7 @@
                         "end_col": 65,
                         "end_line": 275,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 5,
                         "start_line": 275
@@ -2726,7 +2797,7 @@
                         "end_col": 79,
                         "end_line": 350,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 58,
                         "start_line": 350
@@ -2743,7 +2814,7 @@
                         "end_col": 98,
                         "end_line": 350,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 5,
                         "start_line": 350
@@ -2760,7 +2831,7 @@
                         "end_col": 98,
                         "end_line": 350,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 5,
                         "start_line": 350
@@ -2778,7 +2849,7 @@
                                 "end_col": 87,
                                 "end_line": 351,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                                 },
                                 "start_col": 5,
                                 "start_line": 351
@@ -2790,21 +2861,21 @@
                         "end_col": 53,
                         "end_line": 353,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 37,
                                 "end_line": 348,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 35,
                                         "end_line": 354,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                                         },
                                         "start_col": 5,
                                         "start_line": 354
@@ -2831,7 +2902,7 @@
                         "end_col": 33,
                         "end_line": 354,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 19,
                         "start_line": 354
@@ -2848,7 +2919,7 @@
                         "end_col": 35,
                         "end_line": 354,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 5,
                         "start_line": 354
@@ -2865,7 +2936,7 @@
                         "end_col": 40,
                         "end_line": 368,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 18,
                         "start_line": 368
@@ -2882,7 +2953,7 @@
                         "end_col": 72,
                         "end_line": 368,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 5,
                         "start_line": 367
@@ -2899,7 +2970,7 @@
                         "end_col": 72,
                         "end_line": 368,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 5,
                         "start_line": 367
@@ -2916,7 +2987,7 @@
                         "end_col": 72,
                         "end_line": 368,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 5,
                         "start_line": 367
@@ -2934,7 +3005,7 @@
                                 "end_col": 88,
                                 "end_line": 369,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                                 },
                                 "start_col": 5,
                                 "start_line": 369
@@ -2946,21 +3017,21 @@
                         "end_col": 54,
                         "end_line": 370,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 38,
                                 "end_line": 366,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 15,
                                         "end_line": 371,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                                         },
                                         "start_col": 5,
                                         "start_line": 371
@@ -2987,7 +3058,7 @@
                         "end_col": 15,
                         "end_line": 371,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 5,
                         "start_line": 371
@@ -3004,7 +3075,7 @@
                         "end_col": 76,
                         "end_line": 440,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 56,
                         "start_line": 440
@@ -3021,7 +3092,7 @@
                         "end_col": 78,
                         "end_line": 440,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 5,
                         "start_line": 440
@@ -3039,7 +3110,7 @@
                                 "end_col": 86,
                                 "end_line": 441,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                                 },
                                 "start_col": 5,
                                 "start_line": 441
@@ -3051,21 +3122,21 @@
                         "end_col": 51,
                         "end_line": 443,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 36,
                                 "end_line": 438,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 39,
                                         "end_line": 444,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                                         },
                                         "start_col": 5,
                                         "start_line": 444
@@ -3092,7 +3163,7 @@
                         "end_col": 37,
                         "end_line": 444,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 21,
                         "start_line": 444
@@ -3109,7 +3180,7 @@
                         "end_col": 39,
                         "end_line": 444,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "start_col": 5,
                         "start_line": 444
@@ -3127,7 +3198,7 @@
                                 "end_col": 98,
                                 "end_line": 13,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/signature.cairo"
+                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/signature.cairo"
                                 },
                                 "start_col": 5,
                                 "start_line": 13
@@ -3139,7 +3210,7 @@
                         "end_col": 40,
                         "end_line": 14,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/signature.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/signature.cairo"
                         },
                         "start_col": 5,
                         "start_line": 14
@@ -3156,7 +3227,7 @@
                         "end_col": 43,
                         "end_line": 15,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/signature.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/signature.cairo"
                         },
                         "start_col": 5,
                         "start_line": 15
@@ -3173,21 +3244,21 @@
                         "end_col": 54,
                         "end_line": 17,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/signature.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/signature.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 57,
                                 "end_line": 10,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/signature.cairo"
+                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/signature.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 15,
                                         "end_line": 18,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/signature.cairo"
+                                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/signature.cairo"
                                         },
                                         "start_col": 5,
                                         "start_line": 18
@@ -3214,7 +3285,7 @@
                         "end_col": 15,
                         "end_line": 18,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/signature.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/signature.cairo"
                         },
                         "start_col": 5,
                         "start_line": 18
@@ -3232,7 +3303,7 @@
                                 "end_col": 70,
                                 "end_line": 80,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
+                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math_cmp.cairo"
                                 },
                                 "start_col": 5,
                                 "start_line": 80
@@ -3244,7 +3315,7 @@
                         "end_col": 34,
                         "end_line": 81,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math_cmp.cairo"
                         },
                         "start_col": 5,
                         "start_line": 81
@@ -3261,7 +3332,7 @@
                         "end_col": 12,
                         "end_line": 82,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math_cmp.cairo"
                         },
                         "start_col": 5,
                         "start_line": 82
@@ -3278,21 +3349,21 @@
                         "end_col": 32,
                         "end_line": 79,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math_cmp.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 36,
                                 "end_line": 154,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 25,
                                         "end_line": 83,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
+                                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math_cmp.cairo"
                                         },
                                         "start_col": 5,
                                         "start_line": 83
@@ -3319,14 +3390,14 @@
                         "end_col": 35,
                         "end_line": 79,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math_cmp.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 21,
                                 "end_line": 83,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
+                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math_cmp.cairo"
                                 },
                                 "start_col": 20,
                                 "start_line": 83
@@ -3348,14 +3419,14 @@
                         "end_col": 38,
                         "end_line": 79,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math_cmp.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 24,
                                 "end_line": 83,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
+                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math_cmp.cairo"
                                 },
                                 "start_col": 23,
                                 "start_line": 83
@@ -3377,7 +3448,7 @@
                         "end_col": 25,
                         "end_line": 83,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math_cmp.cairo"
                         },
                         "start_col": 5,
                         "start_line": 83
@@ -3394,7 +3465,7 @@
                         "end_col": 13,
                         "end_line": 84,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math_cmp.cairo"
                         },
                         "start_col": 12,
                         "start_line": 84
@@ -3411,7 +3482,7 @@
                         "end_col": 14,
                         "end_line": 84,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math_cmp.cairo"
                         },
                         "start_col": 5,
                         "start_line": 84
@@ -3428,21 +3499,21 @@
                         "end_col": 32,
                         "end_line": 79,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math_cmp.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 36,
                                 "end_line": 223,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math.cairo"
+                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 25,
                                         "end_line": 87,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
+                                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math_cmp.cairo"
                                         },
                                         "start_col": 5,
                                         "start_line": 87
@@ -3469,14 +3540,14 @@
                         "end_col": 38,
                         "end_line": 79,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math_cmp.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 21,
                                 "end_line": 87,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
+                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math_cmp.cairo"
                                 },
                                 "start_col": 20,
                                 "start_line": 87
@@ -3498,14 +3569,14 @@
                         "end_col": 35,
                         "end_line": 79,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math_cmp.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 24,
                                 "end_line": 87,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
+                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math_cmp.cairo"
                                 },
                                 "start_col": 23,
                                 "start_line": 87
@@ -3527,7 +3598,7 @@
                         "end_col": 25,
                         "end_line": 87,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math_cmp.cairo"
                         },
                         "start_col": 5,
                         "start_line": 87
@@ -3544,7 +3615,7 @@
                         "end_col": 13,
                         "end_line": 88,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math_cmp.cairo"
                         },
                         "start_col": 12,
                         "start_line": 88
@@ -3561,7 +3632,7 @@
                         "end_col": 14,
                         "end_line": 88,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math_cmp.cairo"
                         },
                         "start_col": 5,
                         "start_line": 88
@@ -3820,7 +3891,7 @@
                                 "end_col": 37,
                                 "end_line": 348,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                                 },
                                 "parent_location": [
                                     {
@@ -3903,7 +3974,7 @@
                         "end_col": 37,
                         "end_line": 348,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "parent_location": [
                             {
@@ -4186,7 +4257,7 @@
                                 "end_col": 38,
                                 "end_line": 366,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                                 },
                                 "parent_location": [
                                     {
@@ -4413,7 +4484,7 @@
                         "end_col": 40,
                         "end_line": 61,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
@@ -4427,7 +4498,7 @@
                                         "end_col": 46,
                                         "end_line": 64,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "start_col": 9,
                                         "start_line": 64
@@ -4455,7 +4526,7 @@
                         "end_col": 68,
                         "end_line": 61,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
@@ -4469,7 +4540,7 @@
                                         "end_col": 46,
                                         "end_line": 64,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "start_col": 9,
                                         "start_line": 64
@@ -4497,7 +4568,7 @@
                         "end_col": 85,
                         "end_line": 61,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
@@ -4511,7 +4582,7 @@
                                         "end_col": 46,
                                         "end_line": 64,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "start_col": 9,
                                         "start_line": 64
@@ -4539,14 +4610,14 @@
                         "end_col": 26,
                         "end_line": 62,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 45,
                                 "end_line": 64,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "start_col": 34,
                                 "start_line": 64
@@ -4569,7 +4640,7 @@
                         "end_col": 46,
                         "end_line": 64,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 9,
                         "start_line": 64
@@ -4587,7 +4658,7 @@
                         "end_col": 19,
                         "end_line": 65,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 9,
                         "start_line": 65
@@ -4605,21 +4676,21 @@
                         "end_col": 45,
                         "end_line": 72,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 45,
                                 "end_line": 270,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 44,
                                         "end_line": 73,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "start_col": 22,
                                         "start_line": 73
@@ -4647,7 +4718,7 @@
                         "end_col": 44,
                         "end_line": 73,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 22,
                         "start_line": 73
@@ -4665,28 +4736,28 @@
                         "end_col": 45,
                         "end_line": 270,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 44,
                                 "end_line": 73,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 43,
                                         "end_line": 196,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 44,
                                                 "end_line": 74,
                                                 "input_file": {
-                                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                                 },
                                                 "start_col": 24,
                                                 "start_line": 74
@@ -4719,7 +4790,7 @@
                         "end_col": 44,
                         "end_line": 74,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 24,
                         "start_line": 74
@@ -4737,7 +4808,7 @@
                         "end_col": 34,
                         "end_line": 76,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 13,
                         "start_line": 76
@@ -4755,28 +4826,28 @@
                         "end_col": 43,
                         "end_line": 196,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 44,
                                 "end_line": 74,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 45,
                                         "end_line": 72,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 19,
                                                 "end_line": 78,
                                                 "input_file": {
-                                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                                 },
                                                 "start_col": 9,
                                                 "start_line": 78
@@ -4809,7 +4880,7 @@
                         "end_col": 19,
                         "end_line": 78,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 9,
                         "start_line": 78
@@ -4827,7 +4898,7 @@
                         "end_col": 43,
                         "end_line": 85,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
@@ -4841,7 +4912,7 @@
                                         "end_col": 41,
                                         "end_line": 88,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "start_col": 16,
                                         "start_line": 88
@@ -4869,7 +4940,7 @@
                         "end_col": 71,
                         "end_line": 85,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
@@ -4883,7 +4954,7 @@
                                         "end_col": 41,
                                         "end_line": 88,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "start_col": 16,
                                         "start_line": 88
@@ -4911,7 +4982,7 @@
                         "end_col": 88,
                         "end_line": 85,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
@@ -4925,7 +4996,7 @@
                                         "end_col": 41,
                                         "end_line": 88,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "start_col": 16,
                                         "start_line": 88
@@ -4953,7 +5024,7 @@
                         "end_col": 41,
                         "end_line": 88,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 16,
                         "start_line": 88
@@ -4971,7 +5042,7 @@
                         "end_col": 42,
                         "end_line": 88,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 9,
                         "start_line": 88
@@ -4989,7 +5060,7 @@
                         "end_col": 39,
                         "end_line": 94,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 13,
                         "start_line": 94
@@ -5007,7 +5078,7 @@
                         "end_col": 11,
                         "end_line": 94,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 9,
                         "start_line": 94
@@ -5025,21 +5096,21 @@
                         "end_col": 47,
                         "end_line": 91,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 47,
                                 "end_line": 91,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 35,
                                         "end_line": 95,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "start_col": 13,
                                         "start_line": 95
@@ -5067,21 +5138,21 @@
                         "end_col": 75,
                         "end_line": 91,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 75,
                                 "end_line": 91,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 35,
                                         "end_line": 95,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "start_col": 13,
                                         "start_line": 95
@@ -5109,21 +5180,21 @@
                         "end_col": 92,
                         "end_line": 91,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 92,
                                 "end_line": 91,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 35,
                                         "end_line": 95,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "start_col": 13,
                                         "start_line": 95
@@ -5151,7 +5222,7 @@
                         "end_col": 33,
                         "end_line": 95,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 29,
                         "start_line": 95
@@ -5169,7 +5240,7 @@
                         "end_col": 35,
                         "end_line": 95,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 13,
                         "start_line": 95
@@ -5187,7 +5258,7 @@
                         "end_col": 40,
                         "end_line": 97,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 13,
                         "start_line": 97
@@ -5205,7 +5276,7 @@
                         "end_col": 11,
                         "end_line": 97,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 9,
                         "start_line": 97
@@ -5223,21 +5294,21 @@
                         "end_col": 47,
                         "end_line": 91,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 47,
                                 "end_line": 91,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 35,
                                         "end_line": 98,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "start_col": 13,
                                         "start_line": 98
@@ -5265,21 +5336,21 @@
                         "end_col": 75,
                         "end_line": 91,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 75,
                                 "end_line": 91,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 35,
                                         "end_line": 98,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "start_col": 13,
                                         "start_line": 98
@@ -5307,21 +5378,21 @@
                         "end_col": 92,
                         "end_line": 91,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 92,
                                 "end_line": 91,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 35,
                                         "end_line": 98,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "start_col": 13,
                                         "start_line": 98
@@ -5349,7 +5420,7 @@
                         "end_col": 33,
                         "end_line": 98,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 29,
                         "start_line": 98
@@ -5367,7 +5438,7 @@
                         "end_col": 35,
                         "end_line": 98,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 13,
                         "start_line": 98
@@ -5385,21 +5456,21 @@
                         "end_col": 47,
                         "end_line": 91,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 47,
                                 "end_line": 91,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 32,
                                         "end_line": 100,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "start_col": 9,
                                         "start_line": 100
@@ -5427,21 +5498,21 @@
                         "end_col": 75,
                         "end_line": 91,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 75,
                                 "end_line": 91,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 32,
                                         "end_line": 100,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "start_col": 9,
                                         "start_line": 100
@@ -5469,21 +5540,21 @@
                         "end_col": 92,
                         "end_line": 91,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 92,
                                 "end_line": 91,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 32,
                                         "end_line": 100,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "start_col": 9,
                                         "start_line": 100
@@ -5511,7 +5582,7 @@
                         "end_col": 30,
                         "end_line": 100,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 25,
                         "start_line": 100
@@ -5529,7 +5600,7 @@
                         "end_col": 32,
                         "end_line": 100,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 9,
                         "start_line": 100
@@ -5547,21 +5618,21 @@
                         "end_col": 43,
                         "end_line": 107,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 45,
                                 "end_line": 72,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 27,
                                         "end_line": 110,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "start_col": 9,
                                         "start_line": 110
@@ -5589,7 +5660,7 @@
                         "end_col": 27,
                         "end_line": 110,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 9,
                         "start_line": 110
@@ -5607,7 +5678,7 @@
                         "end_col": 71,
                         "end_line": 107,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
@@ -5621,7 +5692,7 @@
                                         "end_col": 49,
                                         "end_line": 111,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "start_col": 9,
                                         "start_line": 111
@@ -5649,7 +5720,7 @@
                         "end_col": 88,
                         "end_line": 107,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
@@ -5663,7 +5734,7 @@
                                         "end_col": 49,
                                         "end_line": 111,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "start_col": 9,
                                         "start_line": 111
@@ -5691,14 +5762,14 @@
                         "end_col": 29,
                         "end_line": 108,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 48,
                                 "end_line": 111,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "start_col": 34,
                                 "start_line": 111
@@ -5721,7 +5792,7 @@
                         "end_col": 49,
                         "end_line": 111,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 9,
                         "start_line": 111
@@ -5739,7 +5810,7 @@
                         "end_col": 19,
                         "end_line": 112,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 9,
                         "start_line": 112
@@ -5757,7 +5828,7 @@
                         "end_col": 27,
                         "end_line": 120,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
@@ -5771,7 +5842,7 @@
                                         "end_col": 54,
                                         "end_line": 125,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "start_col": 29,
                                         "start_line": 125
@@ -5799,7 +5870,7 @@
                         "end_col": 35,
                         "end_line": 121,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
@@ -5813,7 +5884,7 @@
                                         "end_col": 54,
                                         "end_line": 125,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "start_col": 29,
                                         "start_line": 125
@@ -5841,7 +5912,7 @@
                         "end_col": 24,
                         "end_line": 123,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
@@ -5855,7 +5926,7 @@
                                         "end_col": 54,
                                         "end_line": 125,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "start_col": 29,
                                         "start_line": 125
@@ -5883,7 +5954,7 @@
                         "end_col": 54,
                         "end_line": 125,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 29,
                         "start_line": 125
@@ -5901,21 +5972,21 @@
                         "end_col": 37,
                         "end_line": 122,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 57,
                                 "end_line": 10,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/signature.cairo"
+                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/signature.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 10,
                                         "end_line": 135,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "start_col": 9,
                                         "start_line": 133
@@ -5943,14 +6014,14 @@
                         "end_col": 17,
                         "end_line": 124,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 25,
                                 "end_line": 134,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "start_col": 21,
                                 "start_line": 134
@@ -5973,14 +6044,14 @@
                         "end_col": 25,
                         "end_line": 125,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 49,
                                 "end_line": 134,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "start_col": 38,
                                 "start_line": 134
@@ -6003,14 +6074,14 @@
                         "end_col": 33,
                         "end_line": 130,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 68,
                                 "end_line": 134,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "start_col": 63,
                                 "start_line": 134
@@ -6033,14 +6104,14 @@
                         "end_col": 33,
                         "end_line": 131,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 87,
                                 "end_line": 134,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "start_col": 82,
                                 "start_line": 134
@@ -6063,7 +6134,7 @@
                         "end_col": 10,
                         "end_line": 135,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 9,
                         "start_line": 133
@@ -6088,21 +6159,21 @@
                                 "end_col": 54,
                                 "end_line": 125,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 27,
                                         "end_line": 120,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 32,
                                                 "end_line": 137,
                                                 "input_file": {
-                                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                                 },
                                                 "start_col": 9,
                                                 "start_line": 137
@@ -6142,21 +6213,21 @@
                                 "end_col": 54,
                                 "end_line": 125,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 35,
                                         "end_line": 121,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 32,
                                                 "end_line": 137,
                                                 "input_file": {
-                                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                                 },
                                                 "start_col": 9,
                                                 "start_line": 137
@@ -6189,28 +6260,28 @@
                         "end_col": 57,
                         "end_line": 10,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/signature.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/signature.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 10,
                                 "end_line": 135,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 37,
                                         "end_line": 122,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 32,
                                                 "end_line": 137,
                                                 "input_file": {
-                                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                                 },
                                                 "start_col": 9,
                                                 "start_line": 137
@@ -6250,21 +6321,21 @@
                                 "end_col": 54,
                                 "end_line": 125,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 24,
                                         "end_line": 123,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 32,
                                                 "end_line": 137,
                                                 "input_file": {
-                                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                                 },
                                                 "start_col": 9,
                                                 "start_line": 137
@@ -6297,7 +6368,7 @@
                         "end_col": 30,
                         "end_line": 137,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 26,
                         "start_line": 137
@@ -6315,7 +6386,7 @@
                         "end_col": 32,
                         "end_line": 137,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 9,
                         "start_line": 137
@@ -6333,7 +6404,7 @@
                         "end_col": 22,
                         "end_line": 180,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 9,
                         "start_line": 180
@@ -6351,21 +6422,21 @@
                         "end_col": 27,
                         "end_line": 172,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 36,
                                 "end_line": 438,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 38,
                                         "end_line": 182,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "start_col": 25,
                                         "start_line": 182
@@ -6393,7 +6464,7 @@
                         "end_col": 38,
                         "end_line": 182,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 25,
                         "start_line": 182
@@ -6411,21 +6482,21 @@
                         "end_col": 24,
                         "end_line": 176,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 32,
                                 "end_line": 79,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
+                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math_cmp.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 68,
                                         "end_line": 185,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "start_col": 20,
                                         "start_line": 185
@@ -6453,7 +6524,7 @@
                         "end_col": 50,
                         "end_line": 185,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 31,
                         "start_line": 185
@@ -6471,7 +6542,7 @@
                         "end_col": 67,
                         "end_line": 185,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 52,
                         "start_line": 185
@@ -6489,7 +6560,7 @@
                         "end_col": 68,
                         "end_line": 185,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 20,
                         "start_line": 185
@@ -6507,7 +6578,7 @@
                         "end_col": 75,
                         "end_line": 185,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 71,
                         "start_line": 185
@@ -6525,7 +6596,7 @@
                         "end_col": 76,
                         "end_line": 185,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 13,
                         "start_line": 185
@@ -6543,28 +6614,28 @@
                         "end_col": 32,
                         "end_line": 79,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math_cmp.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 68,
                                 "end_line": 185,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 32,
                                         "end_line": 79,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
+                                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math_cmp.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 68,
                                                 "end_line": 185,
                                                 "input_file": {
-                                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                                 },
                                                 "start_col": 20,
                                                 "start_line": 185
@@ -6597,28 +6668,28 @@
                         "end_col": 36,
                         "end_line": 438,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 38,
                                 "end_line": 182,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 43,
                                         "end_line": 196,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 44,
                                                 "end_line": 189,
                                                 "input_file": {
-                                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                                 },
                                                 "start_col": 24,
                                                 "start_line": 189
@@ -6651,7 +6722,7 @@
                         "end_col": 44,
                         "end_line": 189,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 24,
                         "start_line": 189
@@ -6669,7 +6740,7 @@
                         "end_col": 31,
                         "end_line": 191,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 13,
                         "start_line": 191
@@ -6687,7 +6758,7 @@
                         "end_col": 37,
                         "end_line": 195,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 30,
                         "start_line": 195
@@ -6705,14 +6776,14 @@
                         "end_col": 26,
                         "end_line": 195,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 26,
                                 "end_line": 195,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "start_col": 14,
                                 "start_line": 195
@@ -6735,28 +6806,28 @@
                         "end_col": 43,
                         "end_line": 196,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 44,
                                 "end_line": 189,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 53,
                                         "end_line": 233,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 78,
                                                 "end_line": 196,
                                                 "input_file": {
-                                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                                 },
                                                 "start_col": 9,
                                                 "start_line": 196
@@ -6789,14 +6860,14 @@
                         "end_col": 27,
                         "end_line": 177,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 48,
                                 "end_line": 196,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "start_col": 34,
                                 "start_line": 196
@@ -6819,14 +6890,14 @@
                         "end_col": 58,
                         "end_line": 177,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 60,
                                 "end_line": 196,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "start_col": 50,
                                 "start_line": 196
@@ -6849,14 +6920,14 @@
                         "end_col": 95,
                         "end_line": 177,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 70,
                                 "end_line": 196,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "start_col": 62,
                                 "start_line": 196
@@ -6879,21 +6950,21 @@
                         "end_col": 26,
                         "end_line": 195,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 26,
                                 "end_line": 195,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 77,
                                         "end_line": 196,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "start_col": 72,
                                         "start_line": 196
@@ -6921,7 +6992,7 @@
                         "end_col": 78,
                         "end_line": 196,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 9,
                         "start_line": 196
@@ -6939,7 +7010,7 @@
                         "end_col": 40,
                         "end_line": 200,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 33,
                         "start_line": 200
@@ -6957,14 +7028,14 @@
                         "end_col": 29,
                         "end_line": 200,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 29,
                                 "end_line": 200,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "start_col": 14,
                                 "start_line": 200
@@ -6987,28 +7058,28 @@
                         "end_col": 53,
                         "end_line": 233,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 78,
                                 "end_line": 196,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 42,
                                         "end_line": 206,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 71,
                                                 "end_line": 201,
                                                 "input_file": {
-                                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                                 },
                                                 "start_col": 30,
                                                 "start_line": 201
@@ -7041,21 +7112,21 @@
                         "end_col": 27,
                         "end_line": 177,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 39,
                                 "end_line": 197,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 53,
                                         "end_line": 201,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "start_col": 44,
                                         "start_line": 201
@@ -7083,21 +7154,21 @@
                         "end_col": 26,
                         "end_line": 195,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 26,
                                 "end_line": 195,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 60,
                                         "end_line": 201,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "start_col": 55,
                                         "start_line": 201
@@ -7125,21 +7196,21 @@
                         "end_col": 29,
                         "end_line": 200,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 29,
                                 "end_line": 200,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 70,
                                         "end_line": 201,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "start_col": 62,
                                         "start_line": 201
@@ -7167,7 +7238,7 @@
                         "end_col": 71,
                         "end_line": 201,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 30,
                         "start_line": 201
@@ -7185,28 +7256,28 @@
                         "end_col": 42,
                         "end_line": 206,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 71,
                                 "end_line": 201,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 27,
                                         "end_line": 172,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 63,
                                                 "end_line": 203,
                                                 "input_file": {
-                                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                                 },
                                                 "start_col": 9,
                                                 "start_line": 203
@@ -7239,21 +7310,21 @@
                         "end_col": 35,
                         "end_line": 173,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 35,
                                 "end_line": 173,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 63,
                                         "end_line": 203,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "start_col": 9,
                                         "start_line": 203
@@ -7281,21 +7352,21 @@
                         "end_col": 37,
                         "end_line": 174,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 37,
                                 "end_line": 174,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 63,
                                         "end_line": 203,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "start_col": 9,
                                         "start_line": 203
@@ -7323,21 +7394,21 @@
                         "end_col": 37,
                         "end_line": 175,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 37,
                                 "end_line": 175,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 63,
                                         "end_line": 203,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "start_col": 9,
                                         "start_line": 203
@@ -7365,42 +7436,42 @@
                         "end_col": 32,
                         "end_line": 79,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math_cmp.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 68,
                                 "end_line": 185,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 32,
                                         "end_line": 79,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/cairo/common/math_cmp.cairo"
+                                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/cairo/common/math_cmp.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 68,
                                                 "end_line": 185,
                                                 "input_file": {
-                                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                                 },
                                                 "parent_location": [
                                                     {
                                                         "end_col": 24,
                                                         "end_line": 176,
                                                         "input_file": {
-                                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                                         },
                                                         "parent_location": [
                                                             {
                                                                 "end_col": 63,
                                                                 "end_line": 203,
                                                                 "input_file": {
-                                                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                                                 },
                                                                 "start_col": 9,
                                                                 "start_line": 203
@@ -7443,14 +7514,14 @@
                         "end_col": 26,
                         "end_line": 201,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 42,
                                 "end_line": 203,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "start_col": 30,
                                 "start_line": 203
@@ -7473,21 +7544,21 @@
                         "end_col": 29,
                         "end_line": 200,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 29,
                                 "end_line": 200,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 61,
                                         "end_line": 203,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "start_col": 53,
                                         "start_line": 203
@@ -7515,7 +7586,7 @@
                         "end_col": 63,
                         "end_line": 203,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 9,
                         "start_line": 203
@@ -7533,7 +7604,7 @@
                         "end_col": 22,
                         "end_line": 209,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 9,
                         "start_line": 209
@@ -7551,7 +7622,7 @@
                         "end_col": 11,
                         "end_line": 212,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 9,
                         "start_line": 212
@@ -7569,21 +7640,21 @@
                         "end_col": 42,
                         "end_line": 206,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 42,
                                 "end_line": 206,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 37,
                                         "end_line": 213,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "start_col": 13,
                                         "start_line": 213
@@ -7611,7 +7682,7 @@
                         "end_col": 35,
                         "end_line": 213,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 34,
                         "start_line": 213
@@ -7629,7 +7700,7 @@
                         "end_col": 37,
                         "end_line": 213,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 13,
                         "start_line": 213
@@ -7647,21 +7718,21 @@
                         "end_col": 42,
                         "end_line": 206,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 38,
                                 "end_line": 42,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 10,
                                         "end_line": 223,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "start_col": 19,
                                         "start_line": 218
@@ -7689,7 +7760,7 @@
                         "end_col": 42,
                         "end_line": 219,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 30,
                         "start_line": 219
@@ -7707,7 +7778,7 @@
                         "end_col": 49,
                         "end_line": 220,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 31,
                         "start_line": 220
@@ -7725,7 +7796,7 @@
                         "end_col": 49,
                         "end_line": 221,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 27,
                         "start_line": 221
@@ -7743,7 +7814,7 @@
                         "end_col": 40,
                         "end_line": 222,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 22,
                         "start_line": 222
@@ -7761,7 +7832,7 @@
                         "end_col": 10,
                         "end_line": 223,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 19,
                         "start_line": 218
@@ -7779,14 +7850,14 @@
                         "end_col": 16,
                         "end_line": 218,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 16,
                                 "end_line": 218,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "start_col": 13,
                                 "start_line": 218
@@ -7809,14 +7880,14 @@
                         "end_col": 16,
                         "end_line": 218,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 16,
                                 "end_line": 218,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "start_col": 13,
                                 "start_line": 218
@@ -7839,28 +7910,28 @@
                         "end_col": 38,
                         "end_line": 42,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 10,
                                 "end_line": 223,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 38,
                                         "end_line": 42,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 10,
                                                 "end_line": 223,
                                                 "input_file": {
-                                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                                 },
                                                 "start_col": 19,
                                                 "start_line": 218
@@ -7893,14 +7964,14 @@
                         "end_col": 90,
                         "end_line": 206,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 24,
                                 "end_line": 225,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "start_col": 16,
                                 "start_line": 225
@@ -7923,7 +7994,7 @@
                         "end_col": 37,
                         "end_line": 225,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 26,
                         "start_line": 225
@@ -7941,7 +8012,7 @@
                         "end_col": 55,
                         "end_line": 225,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 39,
                         "start_line": 225
@@ -7959,7 +8030,7 @@
                         "end_col": 56,
                         "end_line": 225,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 9,
                         "start_line": 225
@@ -7977,42 +8048,42 @@
                         "end_col": 38,
                         "end_line": 42,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 10,
                                 "end_line": 223,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 38,
                                         "end_line": 42,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 10,
                                                 "end_line": 223,
                                                 "input_file": {
-                                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                                 },
                                                 "parent_location": [
                                                     {
                                                         "end_col": 42,
                                                         "end_line": 206,
                                                         "input_file": {
-                                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                                         },
                                                         "parent_location": [
                                                             {
                                                                 "end_col": 10,
                                                                 "end_line": 229,
                                                                 "input_file": {
-                                                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                                                 },
                                                                 "start_col": 30,
                                                                 "start_line": 227
@@ -8055,7 +8126,7 @@
                         "end_col": 26,
                         "end_line": 228,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 13,
                         "start_line": 228
@@ -8073,7 +8144,7 @@
                         "end_col": 45,
                         "end_line": 228,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 28,
                         "start_line": 228
@@ -8091,7 +8162,7 @@
                         "end_col": 74,
                         "end_line": 228,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 47,
                         "start_line": 228
@@ -8109,7 +8180,7 @@
                         "end_col": 10,
                         "end_line": 229,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 30,
                         "start_line": 227
@@ -8127,28 +8198,28 @@
                         "end_col": 42,
                         "end_line": 206,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 10,
                                 "end_line": 229,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 42,
                                         "end_line": 206,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 63,
                                                 "end_line": 230,
                                                 "input_file": {
-                                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                                 },
                                                 "start_col": 9,
                                                 "start_line": 230
@@ -8181,7 +8252,7 @@
                         "end_col": 61,
                         "end_line": 230,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 30,
                         "start_line": 230
@@ -8199,7 +8270,7 @@
                         "end_col": 63,
                         "end_line": 230,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 9,
                         "start_line": 230
@@ -8217,7 +8288,7 @@
                         "end_col": 11,
                         "end_line": 237,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 9,
                         "start_line": 237
@@ -8235,21 +8306,21 @@
                         "end_col": 53,
                         "end_line": 233,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 53,
                                 "end_line": 233,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 23,
                                         "end_line": 238,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "start_col": 13,
                                         "start_line": 238
@@ -8277,7 +8348,7 @@
                         "end_col": 23,
                         "end_line": 238,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 13,
                         "start_line": 238
@@ -8295,7 +8366,7 @@
                         "end_col": 31,
                         "end_line": 243,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 16,
                         "start_line": 243
@@ -8313,7 +8384,7 @@
                         "end_col": 15,
                         "end_line": 247,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 9,
                         "start_line": 242
@@ -8331,7 +8402,7 @@
                         "end_col": 43,
                         "end_line": 244,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 22,
                         "start_line": 244
@@ -8349,7 +8420,7 @@
                         "end_col": 15,
                         "end_line": 247,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 9,
                         "start_line": 242
@@ -8367,7 +8438,7 @@
                         "end_col": 47,
                         "end_line": 245,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 26,
                         "start_line": 245
@@ -8385,7 +8456,7 @@
                         "end_col": 15,
                         "end_line": 247,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 9,
                         "start_line": 242
@@ -8403,7 +8474,7 @@
                         "end_col": 57,
                         "end_line": 246,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 33,
                         "start_line": 246
@@ -8421,7 +8492,7 @@
                         "end_col": 57,
                         "end_line": 246,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 22,
                         "start_line": 246
@@ -8439,7 +8510,7 @@
                         "end_col": 15,
                         "end_line": 247,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 9,
                         "start_line": 242
@@ -8457,21 +8528,21 @@
                         "end_col": 53,
                         "end_line": 233,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 53,
                                 "end_line": 233,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 10,
                                         "end_line": 251,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "start_col": 9,
                                         "start_line": 249
@@ -8499,7 +8570,7 @@
                         "end_col": 31,
                         "end_line": 250,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 13,
                         "start_line": 250
@@ -8517,7 +8588,7 @@
                         "end_col": 67,
                         "end_line": 250,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 33,
                         "start_line": 250
@@ -8535,14 +8606,14 @@
                         "end_col": 77,
                         "end_line": 234,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 77,
                                 "end_line": 250,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "start_col": 69,
                                 "start_line": 250
@@ -8565,7 +8636,7 @@
                         "end_col": 96,
                         "end_line": 250,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 79,
                         "start_line": 250
@@ -8583,7 +8654,7 @@
                         "end_col": 10,
                         "end_line": 251,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 9,
                         "start_line": 249
@@ -8601,7 +8672,7 @@
                         "end_col": 19,
                         "end_line": 252,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "start_col": 9,
                         "start_line": 252
@@ -8616,8 +8687,8 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 36,
-                        "end_line": 17,
+                        "end_col": 23,
+                        "end_line": 18,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
@@ -8626,17 +8697,17 @@
                                 "end_col": 40,
                                 "end_line": 61,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 35,
-                                        "end_line": 20,
+                                        "end_line": 22,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 5,
-                                        "start_line": 20
+                                        "start_line": 22
                                     },
                                     "While trying to retrieve the implicit argument 'syscall_ptr' in:"
                                 ],
@@ -8645,8 +8716,8 @@
                             },
                             "While expanding the reference 'syscall_ptr' in:"
                         ],
-                        "start_col": 18,
-                        "start_line": 17
+                        "start_col": 5,
+                        "start_line": 18
                     }
                 },
                 "360": {
@@ -8658,8 +8729,8 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 64,
-                        "end_line": 17,
+                        "end_col": 31,
+                        "end_line": 19,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
@@ -8668,17 +8739,17 @@
                                 "end_col": 68,
                                 "end_line": 61,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 35,
-                                        "end_line": 20,
+                                        "end_line": 22,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 5,
-                                        "start_line": 20
+                                        "start_line": 22
                                     },
                                     "While trying to retrieve the implicit argument 'pedersen_ptr' in:"
                                 ],
@@ -8687,8 +8758,8 @@
                             },
                             "While expanding the reference 'pedersen_ptr' in:"
                         ],
-                        "start_col": 38,
-                        "start_line": 17
+                        "start_col": 5,
+                        "start_line": 19
                     }
                 },
                 "361": {
@@ -8700,8 +8771,8 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 81,
-                        "end_line": 17,
+                        "end_col": 20,
+                        "end_line": 20,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
@@ -8710,17 +8781,17 @@
                                 "end_col": 85,
                                 "end_line": 61,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 35,
-                                        "end_line": 20,
+                                        "end_line": 22,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 5,
-                                        "start_line": 20
+                                        "start_line": 22
                                     },
                                     "While trying to retrieve the implicit argument 'range_check_ptr' in:"
                                 ],
@@ -8729,8 +8800,8 @@
                             },
                             "While expanding the reference 'range_check_ptr' in:"
                         ],
-                        "start_col": 66,
-                        "start_line": 17
+                        "start_col": 5,
+                        "start_line": 20
                     }
                 },
                 "362": {
@@ -8742,25 +8813,25 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 20,
-                        "end_line": 18,
+                        "end_col": 18,
+                        "end_line": 21,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 34,
-                                "end_line": 20,
+                                "end_line": 22,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 25,
-                                "start_line": 20
+                                "start_line": 22
                             },
                             "While expanding the reference 'publicKey' in:"
                         ],
-                        "start_col": 5,
-                        "start_line": 18
+                        "start_col": 3,
+                        "start_line": 21
                     }
                 },
                 "363": {
@@ -8773,12 +8844,12 @@
                     "hints": [],
                     "inst": {
                         "end_col": 35,
-                        "end_line": 20,
+                        "end_line": 22,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 5,
-                        "start_line": 20
+                        "start_line": 22
                     }
                 },
                 "365": {
@@ -8791,12 +8862,12 @@
                     "hints": [],
                     "inst": {
                         "end_col": 15,
-                        "end_line": 21,
+                        "end_line": 23,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 5,
-                        "start_line": 21
+                        "start_line": 23
                     }
                 },
                 "366": {
@@ -8816,8 +8887,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 20,
-                                "end_line": 18,
+                                "end_col": 18,
+                                "end_line": 21,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -8869,8 +8940,8 @@
                                     },
                                     "While expanding the reference '__calldata_ptr' in:"
                                 ],
-                                "start_col": 5,
-                                "start_line": 18
+                                "start_col": 3,
+                                "start_line": 21
                             },
                             "While handling calldata argument 'publicKey'"
                         ],
@@ -8926,8 +8997,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 36,
-                                "end_line": 17,
+                                "end_col": 23,
+                                "end_line": 18,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -8955,8 +9026,8 @@
                                     },
                                     "While expanding the reference 'syscall_ptr' in:"
                                 ],
-                                "start_col": 18,
-                                "start_line": 17
+                                "start_col": 5,
+                                "start_line": 18
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -8981,8 +9052,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 64,
-                                "end_line": 17,
+                                "end_col": 31,
+                                "end_line": 19,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -9010,8 +9081,8 @@
                                     },
                                     "While expanding the reference 'pedersen_ptr' in:"
                                 ],
-                                "start_col": 38,
-                                "start_line": 17
+                                "start_col": 5,
+                                "start_line": 19
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -9036,8 +9107,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 81,
-                                "end_line": 17,
+                                "end_col": 20,
+                                "end_line": 20,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -9065,8 +9136,8 @@
                                     },
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
-                                "start_col": 66,
-                                "start_line": 17
+                                "start_col": 5,
+                                "start_line": 20
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -9091,8 +9162,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 20,
-                                "end_line": 18,
+                                "end_col": 18,
+                                "end_line": 21,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -9120,8 +9191,8 @@
                                     },
                                     "While expanding the reference '__calldata_arg_publicKey' in:"
                                 ],
-                                "start_col": 5,
-                                "start_line": 18
+                                "start_col": 3,
+                                "start_line": 21
                             },
                             "While handling calldata argument 'publicKey'"
                         ],
@@ -9629,8 +9700,8 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 37,
-                        "end_line": 29,
+                        "end_col": 23,
+                        "end_line": 32,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
@@ -9639,17 +9710,17 @@
                                 "end_col": 43,
                                 "end_line": 85,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 53,
-                                        "end_line": 32,
+                                        "end_line": 36,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 29,
-                                        "start_line": 32
+                                        "start_line": 36
                                     },
                                     "While trying to retrieve the implicit argument 'syscall_ptr' in:"
                                 ],
@@ -9658,8 +9729,8 @@
                             },
                             "While expanding the reference 'syscall_ptr' in:"
                         ],
-                        "start_col": 19,
-                        "start_line": 29
+                        "start_col": 5,
+                        "start_line": 32
                     }
                 },
                 "387": {
@@ -9671,8 +9742,8 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 65,
-                        "end_line": 29,
+                        "end_col": 31,
+                        "end_line": 33,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
@@ -9681,17 +9752,17 @@
                                 "end_col": 71,
                                 "end_line": 85,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 53,
-                                        "end_line": 32,
+                                        "end_line": 36,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 29,
-                                        "start_line": 32
+                                        "start_line": 36
                                     },
                                     "While trying to retrieve the implicit argument 'pedersen_ptr' in:"
                                 ],
@@ -9700,8 +9771,8 @@
                             },
                             "While expanding the reference 'pedersen_ptr' in:"
                         ],
-                        "start_col": 39,
-                        "start_line": 29
+                        "start_col": 5,
+                        "start_line": 33
                     }
                 },
                 "388": {
@@ -9713,8 +9784,8 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 82,
-                        "end_line": 29,
+                        "end_col": 20,
+                        "end_line": 34,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
@@ -9723,17 +9794,17 @@
                                 "end_col": 88,
                                 "end_line": 85,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 53,
-                                        "end_line": 32,
+                                        "end_line": 36,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 29,
-                                        "start_line": 32
+                                        "start_line": 36
                                     },
                                     "While trying to retrieve the implicit argument 'range_check_ptr' in:"
                                 ],
@@ -9742,8 +9813,8 @@
                             },
                             "While expanding the reference 'range_check_ptr' in:"
                         ],
-                        "start_col": 67,
-                        "start_line": 29
+                        "start_col": 5,
+                        "start_line": 34
                     }
                 },
                 "389": {
@@ -9756,12 +9827,12 @@
                     "hints": [],
                     "inst": {
                         "end_col": 53,
-                        "end_line": 32,
+                        "end_line": 36,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 29,
-                        "start_line": 32
+                        "start_line": 36
                     }
                 },
                 "391": {
@@ -9774,12 +9845,12 @@
                     "hints": [],
                     "inst": {
                         "end_col": 34,
-                        "end_line": 33,
+                        "end_line": 37,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 5,
-                        "start_line": 33
+                        "start_line": 37
                     }
                 },
                 "392": {
@@ -9801,12 +9872,12 @@
                                 "parent_location": [
                                     {
                                         "end_col": 18,
-                                        "end_line": 29,
+                                        "end_line": 31,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 6,
-                                        "start_line": 29
+                                        "start_line": 31
                                     },
                                     "While handling return value of"
                                 ],
@@ -9825,12 +9896,12 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 29,
+                                "end_line": 31,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 29
+                                "start_line": 31
                             },
                             "While handling return value of"
                         ],
@@ -9855,13 +9926,13 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 20,
-                                "end_line": 30,
+                                "end_col": 25,
+                                "end_line": 35,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
-                                "start_col": 5,
-                                "start_line": 30
+                                "start_col": 10,
+                                "start_line": 35
                             },
                             "While handling return value 'publicKey'"
                         ],
@@ -9886,8 +9957,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 20,
-                                "end_line": 30,
+                                "end_col": 25,
+                                "end_line": 35,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -9901,12 +9972,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 29,
+                                                "end_line": 31,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 29
+                                                "start_line": 31
                                             },
                                             "While handling return value of"
                                         ],
@@ -9915,8 +9986,8 @@
                                     },
                                     "While expanding the reference '__return_value_ptr' in:"
                                 ],
-                                "start_col": 5,
-                                "start_line": 30
+                                "start_col": 10,
+                                "start_line": 35
                             },
                             "While handling return value 'publicKey'"
                         ],
@@ -9942,7 +10013,7 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 29,
+                                "end_line": 31,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -9956,12 +10027,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 29,
+                                                "end_line": 31,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 29
+                                                "start_line": 31
                                             },
                                             "While handling return value of"
                                         ],
@@ -9971,7 +10042,7 @@
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 29
+                                "start_line": 31
                             },
                             "While handling return value of"
                         ],
@@ -9997,12 +10068,12 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 29,
+                                "end_line": 31,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 29
+                                "start_line": 31
                             },
                             "While handling return value of"
                         ],
@@ -10028,7 +10099,7 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 29,
+                                "end_line": 31,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -10042,12 +10113,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 29,
+                                                "end_line": 31,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 29
+                                                "start_line": 31
                                             },
                                             "While handling return value of"
                                         ],
@@ -10057,7 +10128,7 @@
                                     "While expanding the reference '__return_value_ptr_start' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 29
+                                "start_line": 31
                             },
                             "While handling return value of"
                         ],
@@ -10083,12 +10154,12 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 29,
+                                "end_line": 31,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 29
+                                "start_line": 31
                             },
                             "While handling return value of"
                         ],
@@ -10114,12 +10185,12 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 29,
+                                "end_line": 31,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 29
+                                "start_line": 31
                             },
                             "While handling calldata of"
                         ],
@@ -10144,8 +10215,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 37,
-                                "end_line": 29,
+                                "end_col": 23,
+                                "end_line": 32,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -10159,12 +10230,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 29,
+                                                "end_line": 31,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 29
+                                                "start_line": 31
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -10173,8 +10244,8 @@
                                     },
                                     "While expanding the reference 'syscall_ptr' in:"
                                 ],
-                                "start_col": 19,
-                                "start_line": 29
+                                "start_col": 5,
+                                "start_line": 32
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -10199,8 +10270,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 65,
-                                "end_line": 29,
+                                "end_col": 31,
+                                "end_line": 33,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -10214,12 +10285,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 29,
+                                                "end_line": 31,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 29
+                                                "start_line": 31
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -10228,8 +10299,8 @@
                                     },
                                     "While expanding the reference 'pedersen_ptr' in:"
                                 ],
-                                "start_col": 39,
-                                "start_line": 29
+                                "start_col": 5,
+                                "start_line": 33
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -10254,8 +10325,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 82,
-                                "end_line": 29,
+                                "end_col": 20,
+                                "end_line": 34,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -10269,12 +10340,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 29,
+                                                "end_line": 31,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 29
+                                                "start_line": 31
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -10283,8 +10354,8 @@
                                     },
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
-                                "start_col": 67,
-                                "start_line": 29
+                                "start_col": 5,
+                                "start_line": 34
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -10303,12 +10374,12 @@
                     "hints": [],
                     "inst": {
                         "end_col": 18,
-                        "end_line": 29,
+                        "end_line": 31,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 6,
-                        "start_line": 29
+                        "start_line": 31
                     }
                 },
                 "407": {
@@ -10329,7 +10400,7 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 29,
+                                "end_line": 31,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -10343,12 +10414,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 29,
+                                                "end_line": 31,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 29
+                                                "start_line": 31
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -10358,7 +10429,7 @@
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 29
+                                "start_line": 31
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -10384,12 +10455,12 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 29,
+                                "end_line": 31,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 29
+                                "start_line": 31
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -10415,7 +10486,7 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 29,
+                                "end_line": 31,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -10429,12 +10500,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 29,
+                                                "end_line": 31,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 29
+                                                "start_line": 31
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -10444,7 +10515,7 @@
                                     "While expanding the reference 'syscall_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 29
+                                "start_line": 31
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -10470,7 +10541,7 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 29,
+                                "end_line": 31,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -10484,12 +10555,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 29,
+                                                "end_line": 31,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 29
+                                                "start_line": 31
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -10499,7 +10570,7 @@
                                     "While expanding the reference 'pedersen_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 29
+                                "start_line": 31
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -10525,7 +10596,7 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 29,
+                                "end_line": 31,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -10539,12 +10610,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 29,
+                                                "end_line": 31,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 29
+                                                "start_line": 31
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -10554,7 +10625,7 @@
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 29
+                                "start_line": 31
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -10580,7 +10651,7 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 29,
+                                "end_line": 31,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -10594,12 +10665,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 29,
+                                                "end_line": 31,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 29
+                                                "start_line": 31
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -10609,7 +10680,7 @@
                                     "While expanding the reference 'ecdsa_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 29
+                                "start_line": 31
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -10635,7 +10706,7 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 29,
+                                "end_line": 31,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -10649,12 +10720,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 29,
+                                                "end_line": 31,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 29
+                                                "start_line": 31
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -10664,7 +10735,7 @@
                                     "While expanding the reference 'bitwise_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 29
+                                "start_line": 31
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -10690,7 +10761,7 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 29,
+                                "end_line": 31,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -10704,12 +10775,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 29,
+                                                "end_line": 31,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 29
+                                                "start_line": 31
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -10719,7 +10790,7 @@
                                     "While expanding the reference 'retdata_size' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 29
+                                "start_line": 31
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -10745,7 +10816,7 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 29,
+                                "end_line": 31,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -10759,12 +10830,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 29,
+                                                "end_line": 31,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 29
+                                                "start_line": 31
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -10774,7 +10845,7 @@
                                     "While expanding the reference 'retdata' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 29
+                                "start_line": 31
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -10800,12 +10871,12 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 29,
+                                "end_line": 31,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 29
+                                "start_line": 31
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -10822,8 +10893,8 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 42,
-                        "end_line": 37,
+                        "end_col": 23,
+                        "end_line": 42,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
@@ -10832,17 +10903,17 @@
                                 "end_col": 47,
                                 "end_line": 91,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 51,
-                                        "end_line": 40,
+                                        "end_line": 46,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 12,
-                                        "start_line": 40
+                                        "start_line": 46
                                     },
                                     "While trying to retrieve the implicit argument 'syscall_ptr' in:"
                                 ],
@@ -10851,8 +10922,8 @@
                             },
                             "While expanding the reference 'syscall_ptr' in:"
                         ],
-                        "start_col": 24,
-                        "start_line": 37
+                        "start_col": 5,
+                        "start_line": 42
                     }
                 },
                 "419": {
@@ -10864,8 +10935,8 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 70,
-                        "end_line": 37,
+                        "end_col": 31,
+                        "end_line": 43,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
@@ -10874,17 +10945,17 @@
                                 "end_col": 75,
                                 "end_line": 91,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 51,
-                                        "end_line": 40,
+                                        "end_line": 46,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 12,
-                                        "start_line": 40
+                                        "start_line": 46
                                     },
                                     "While trying to retrieve the implicit argument 'pedersen_ptr' in:"
                                 ],
@@ -10893,8 +10964,8 @@
                             },
                             "While expanding the reference 'pedersen_ptr' in:"
                         ],
-                        "start_col": 44,
-                        "start_line": 37
+                        "start_col": 5,
+                        "start_line": 43
                     }
                 },
                 "420": {
@@ -10906,8 +10977,8 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 87,
-                        "end_line": 37,
+                        "end_col": 20,
+                        "end_line": 44,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
@@ -10916,17 +10987,17 @@
                                 "end_col": 92,
                                 "end_line": 91,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 51,
-                                        "end_line": 40,
+                                        "end_line": 46,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 12,
-                                        "start_line": 40
+                                        "start_line": 46
                                     },
                                     "While trying to retrieve the implicit argument 'range_check_ptr' in:"
                                 ],
@@ -10935,8 +11006,8 @@
                             },
                             "While expanding the reference 'range_check_ptr' in:"
                         ],
-                        "start_col": 72,
-                        "start_line": 37
+                        "start_col": 5,
+                        "start_line": 44
                     }
                 },
                 "421": {
@@ -10948,25 +11019,25 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 22,
-                        "end_line": 38,
+                        "end_col": 21,
+                        "end_line": 45,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 50,
-                                "end_line": 40,
+                                "end_line": 46,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 39,
-                                "start_line": 40
+                                "start_line": 46
                             },
                             "While expanding the reference 'interfaceId' in:"
                         ],
-                        "start_col": 5,
-                        "start_line": 38
+                        "start_col": 4,
+                        "start_line": 45
                     }
                 },
                 "422": {
@@ -10979,12 +11050,12 @@
                     "hints": [],
                     "inst": {
                         "end_col": 51,
-                        "end_line": 40,
+                        "end_line": 46,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 12,
-                        "start_line": 40
+                        "start_line": 46
                     }
                 },
                 "424": {
@@ -10997,12 +11068,12 @@
                     "hints": [],
                     "inst": {
                         "end_col": 52,
-                        "end_line": 40,
+                        "end_line": 46,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 5,
-                        "start_line": 40
+                        "start_line": 46
                     }
                 },
                 "425": {
@@ -11024,12 +11095,12 @@
                                 "parent_location": [
                                     {
                                         "end_col": 23,
-                                        "end_line": 37,
+                                        "end_line": 41,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 6,
-                                        "start_line": 37
+                                        "start_line": 41
                                     },
                                     "While handling return value of"
                                 ],
@@ -11048,12 +11119,12 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 37,
+                                "end_line": 41,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 37
+                                "start_line": 41
                             },
                             "While handling return value of"
                         ],
@@ -11078,13 +11149,13 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 20,
-                                "end_line": 39,
+                                "end_col": 40,
+                                "end_line": 45,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
-                                "start_col": 7,
-                                "start_line": 39
+                                "start_col": 27,
+                                "start_line": 45
                             },
                             "While handling return value 'success'"
                         ],
@@ -11109,8 +11180,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 20,
-                                "end_line": 39,
+                                "end_col": 40,
+                                "end_line": 45,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -11124,12 +11195,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 23,
-                                                "end_line": 37,
+                                                "end_line": 41,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 37
+                                                "start_line": 41
                                             },
                                             "While handling return value of"
                                         ],
@@ -11138,8 +11209,8 @@
                                     },
                                     "While expanding the reference '__return_value_ptr' in:"
                                 ],
-                                "start_col": 7,
-                                "start_line": 39
+                                "start_col": 27,
+                                "start_line": 45
                             },
                             "While handling return value 'success'"
                         ],
@@ -11165,7 +11236,7 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 37,
+                                "end_line": 41,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -11179,12 +11250,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 23,
-                                                "end_line": 37,
+                                                "end_line": 41,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 37
+                                                "start_line": 41
                                             },
                                             "While handling return value of"
                                         ],
@@ -11194,7 +11265,7 @@
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 37
+                                "start_line": 41
                             },
                             "While handling return value of"
                         ],
@@ -11220,12 +11291,12 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 37,
+                                "end_line": 41,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 37
+                                "start_line": 41
                             },
                             "While handling return value of"
                         ],
@@ -11251,7 +11322,7 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 37,
+                                "end_line": 41,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -11265,12 +11336,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 23,
-                                                "end_line": 37,
+                                                "end_line": 41,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 37
+                                                "start_line": 41
                                             },
                                             "While handling return value of"
                                         ],
@@ -11280,7 +11351,7 @@
                                     "While expanding the reference '__return_value_ptr_start' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 37
+                                "start_line": 41
                             },
                             "While handling return value of"
                         ],
@@ -11306,12 +11377,12 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 37,
+                                "end_line": 41,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 37
+                                "start_line": 41
                             },
                             "While handling return value of"
                         ],
@@ -11336,8 +11407,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 22,
-                                "end_line": 38,
+                                "end_col": 21,
+                                "end_line": 45,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -11351,7 +11422,7 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 23,
-                                                "end_line": 37,
+                                                "end_line": 41,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
@@ -11365,12 +11436,12 @@
                                                         "parent_location": [
                                                             {
                                                                 "end_col": 23,
-                                                                "end_line": 37,
+                                                                "end_line": 41,
                                                                 "input_file": {
                                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                                 },
                                                                 "start_col": 6,
-                                                                "start_line": 37
+                                                                "start_line": 41
                                                             },
                                                             "While handling calldata of"
                                                         ],
@@ -11380,7 +11451,7 @@
                                                     "While expanding the reference '__calldata_actual_size' in:"
                                                 ],
                                                 "start_col": 6,
-                                                "start_line": 37
+                                                "start_line": 41
                                             },
                                             "While handling calldata of"
                                         ],
@@ -11389,8 +11460,8 @@
                                     },
                                     "While expanding the reference '__calldata_ptr' in:"
                                 ],
-                                "start_col": 5,
-                                "start_line": 38
+                                "start_col": 4,
+                                "start_line": 45
                             },
                             "While handling calldata argument 'interfaceId'"
                         ],
@@ -11416,12 +11487,12 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 37,
+                                "end_line": 41,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 37
+                                "start_line": 41
                             },
                             "While handling calldata of"
                         ],
@@ -11446,8 +11517,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 42,
-                                "end_line": 37,
+                                "end_col": 23,
+                                "end_line": 42,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -11461,12 +11532,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 23,
-                                                "end_line": 37,
+                                                "end_line": 41,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 37
+                                                "start_line": 41
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -11475,8 +11546,8 @@
                                     },
                                     "While expanding the reference 'syscall_ptr' in:"
                                 ],
-                                "start_col": 24,
-                                "start_line": 37
+                                "start_col": 5,
+                                "start_line": 42
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -11501,8 +11572,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 70,
-                                "end_line": 37,
+                                "end_col": 31,
+                                "end_line": 43,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -11516,12 +11587,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 23,
-                                                "end_line": 37,
+                                                "end_line": 41,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 37
+                                                "start_line": 41
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -11530,8 +11601,8 @@
                                     },
                                     "While expanding the reference 'pedersen_ptr' in:"
                                 ],
-                                "start_col": 44,
-                                "start_line": 37
+                                "start_col": 5,
+                                "start_line": 43
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -11556,8 +11627,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 87,
-                                "end_line": 37,
+                                "end_col": 20,
+                                "end_line": 44,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -11571,12 +11642,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 23,
-                                                "end_line": 37,
+                                                "end_line": 41,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 37
+                                                "start_line": 41
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -11585,8 +11656,8 @@
                                     },
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
-                                "start_col": 72,
-                                "start_line": 37
+                                "start_col": 5,
+                                "start_line": 44
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -11611,8 +11682,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 22,
-                                "end_line": 38,
+                                "end_col": 21,
+                                "end_line": 45,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -11626,12 +11697,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 23,
-                                                "end_line": 37,
+                                                "end_line": 41,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 37
+                                                "start_line": 41
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -11640,8 +11711,8 @@
                                     },
                                     "While expanding the reference '__calldata_arg_interfaceId' in:"
                                 ],
-                                "start_col": 5,
-                                "start_line": 38
+                                "start_col": 4,
+                                "start_line": 45
                             },
                             "While handling calldata argument 'interfaceId'"
                         ],
@@ -11660,12 +11731,12 @@
                     "hints": [],
                     "inst": {
                         "end_col": 23,
-                        "end_line": 37,
+                        "end_line": 41,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 6,
-                        "start_line": 37
+                        "start_line": 41
                     }
                 },
                 "443": {
@@ -11686,7 +11757,7 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 37,
+                                "end_line": 41,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -11700,12 +11771,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 23,
-                                                "end_line": 37,
+                                                "end_line": 41,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 37
+                                                "start_line": 41
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -11715,7 +11786,7 @@
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 37
+                                "start_line": 41
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -11741,12 +11812,12 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 37,
+                                "end_line": 41,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 37
+                                "start_line": 41
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -11772,7 +11843,7 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 37,
+                                "end_line": 41,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -11786,12 +11857,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 23,
-                                                "end_line": 37,
+                                                "end_line": 41,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 37
+                                                "start_line": 41
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -11801,7 +11872,7 @@
                                     "While expanding the reference 'syscall_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 37
+                                "start_line": 41
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -11827,7 +11898,7 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 37,
+                                "end_line": 41,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -11841,12 +11912,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 23,
-                                                "end_line": 37,
+                                                "end_line": 41,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 37
+                                                "start_line": 41
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -11856,7 +11927,7 @@
                                     "While expanding the reference 'pedersen_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 37
+                                "start_line": 41
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -11882,7 +11953,7 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 37,
+                                "end_line": 41,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -11896,12 +11967,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 23,
-                                                "end_line": 37,
+                                                "end_line": 41,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 37
+                                                "start_line": 41
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -11911,7 +11982,7 @@
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 37
+                                "start_line": 41
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -11937,7 +12008,7 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 37,
+                                "end_line": 41,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -11951,12 +12022,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 23,
-                                                "end_line": 37,
+                                                "end_line": 41,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 37
+                                                "start_line": 41
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -11966,7 +12037,7 @@
                                     "While expanding the reference 'ecdsa_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 37
+                                "start_line": 41
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -11992,7 +12063,7 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 37,
+                                "end_line": 41,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -12006,12 +12077,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 23,
-                                                "end_line": 37,
+                                                "end_line": 41,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 37
+                                                "start_line": 41
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -12021,7 +12092,7 @@
                                     "While expanding the reference 'bitwise_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 37
+                                "start_line": 41
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -12047,7 +12118,7 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 37,
+                                "end_line": 41,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -12061,12 +12132,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 23,
-                                                "end_line": 37,
+                                                "end_line": 41,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 37
+                                                "start_line": 41
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -12076,7 +12147,7 @@
                                     "While expanding the reference 'retdata_size' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 37
+                                "start_line": 41
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -12102,7 +12173,7 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 37,
+                                "end_line": 41,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -12116,12 +12187,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 23,
-                                                "end_line": 37,
+                                                "end_line": 41,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 37
+                                                "start_line": 41
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -12131,7 +12202,7 @@
                                     "While expanding the reference 'retdata' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 37
+                                "start_line": 41
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -12157,12 +12228,12 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 37,
+                                "end_line": 41,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 37
+                                "start_line": 41
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -12179,8 +12250,8 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 37,
-                        "end_line": 48,
+                        "end_col": 23,
+                        "end_line": 55,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
@@ -12189,17 +12260,17 @@
                                 "end_col": 43,
                                 "end_line": 107,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 41,
-                                        "end_line": 51,
+                                        "end_line": 59,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 5,
-                                        "start_line": 51
+                                        "start_line": 59
                                     },
                                     "While trying to retrieve the implicit argument 'syscall_ptr' in:"
                                 ],
@@ -12208,8 +12279,8 @@
                             },
                             "While expanding the reference 'syscall_ptr' in:"
                         ],
-                        "start_col": 19,
-                        "start_line": 48
+                        "start_col": 5,
+                        "start_line": 55
                     }
                 },
                 "455": {
@@ -12221,8 +12292,8 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 65,
-                        "end_line": 48,
+                        "end_col": 31,
+                        "end_line": 56,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
@@ -12231,17 +12302,17 @@
                                 "end_col": 71,
                                 "end_line": 107,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 41,
-                                        "end_line": 51,
+                                        "end_line": 59,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 5,
-                                        "start_line": 51
+                                        "start_line": 59
                                     },
                                     "While trying to retrieve the implicit argument 'pedersen_ptr' in:"
                                 ],
@@ -12250,8 +12321,8 @@
                             },
                             "While expanding the reference 'pedersen_ptr' in:"
                         ],
-                        "start_col": 39,
-                        "start_line": 48
+                        "start_col": 5,
+                        "start_line": 56
                     }
                 },
                 "456": {
@@ -12263,8 +12334,8 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 82,
-                        "end_line": 48,
+                        "end_col": 20,
+                        "end_line": 57,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
@@ -12273,17 +12344,17 @@
                                 "end_col": 88,
                                 "end_line": 107,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 41,
-                                        "end_line": 51,
+                                        "end_line": 59,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 5,
-                                        "start_line": 51
+                                        "start_line": 59
                                     },
                                     "While trying to retrieve the implicit argument 'range_check_ptr' in:"
                                 ],
@@ -12292,8 +12363,8 @@
                             },
                             "While expanding the reference 'range_check_ptr' in:"
                         ],
-                        "start_col": 67,
-                        "start_line": 48
+                        "start_col": 5,
+                        "start_line": 57
                     }
                 },
                 "457": {
@@ -12305,25 +12376,25 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 23,
-                        "end_line": 49,
+                        "end_col": 22,
+                        "end_line": 58,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 40,
-                                "end_line": 51,
+                                "end_line": 59,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 28,
-                                "start_line": 51
+                                "start_line": 59
                             },
                             "While expanding the reference 'newPublicKey' in:"
                         ],
-                        "start_col": 5,
-                        "start_line": 49
+                        "start_col": 4,
+                        "start_line": 58
                     }
                 },
                 "458": {
@@ -12336,12 +12407,12 @@
                     "hints": [],
                     "inst": {
                         "end_col": 41,
-                        "end_line": 51,
+                        "end_line": 59,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 5,
-                        "start_line": 51
+                        "start_line": 59
                     }
                 },
                 "460": {
@@ -12354,12 +12425,12 @@
                     "hints": [],
                     "inst": {
                         "end_col": 15,
-                        "end_line": 52,
+                        "end_line": 60,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 5,
-                        "start_line": 52
+                        "start_line": 60
                     }
                 },
                 "461": {
@@ -12379,8 +12450,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 23,
-                                "end_line": 49,
+                                "end_col": 22,
+                                "end_line": 58,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -12394,7 +12465,7 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 48,
+                                                "end_line": 54,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
@@ -12408,12 +12479,12 @@
                                                         "parent_location": [
                                                             {
                                                                 "end_col": 18,
-                                                                "end_line": 48,
+                                                                "end_line": 54,
                                                                 "input_file": {
                                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                                 },
                                                                 "start_col": 6,
-                                                                "start_line": 48
+                                                                "start_line": 54
                                                             },
                                                             "While handling calldata of"
                                                         ],
@@ -12423,7 +12494,7 @@
                                                     "While expanding the reference '__calldata_actual_size' in:"
                                                 ],
                                                 "start_col": 6,
-                                                "start_line": 48
+                                                "start_line": 54
                                             },
                                             "While handling calldata of"
                                         ],
@@ -12432,8 +12503,8 @@
                                     },
                                     "While expanding the reference '__calldata_ptr' in:"
                                 ],
-                                "start_col": 5,
-                                "start_line": 49
+                                "start_col": 4,
+                                "start_line": 58
                             },
                             "While handling calldata argument 'newPublicKey'"
                         ],
@@ -12459,12 +12530,12 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 48,
+                                "end_line": 54,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 48
+                                "start_line": 54
                             },
                             "While handling calldata of"
                         ],
@@ -12489,8 +12560,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 37,
-                                "end_line": 48,
+                                "end_col": 23,
+                                "end_line": 55,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -12504,12 +12575,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 48,
+                                                "end_line": 54,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 48
+                                                "start_line": 54
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -12518,8 +12589,8 @@
                                     },
                                     "While expanding the reference 'syscall_ptr' in:"
                                 ],
-                                "start_col": 19,
-                                "start_line": 48
+                                "start_col": 5,
+                                "start_line": 55
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -12544,8 +12615,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 65,
-                                "end_line": 48,
+                                "end_col": 31,
+                                "end_line": 56,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -12559,12 +12630,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 48,
+                                                "end_line": 54,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 48
+                                                "start_line": 54
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -12573,8 +12644,8 @@
                                     },
                                     "While expanding the reference 'pedersen_ptr' in:"
                                 ],
-                                "start_col": 39,
-                                "start_line": 48
+                                "start_col": 5,
+                                "start_line": 56
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -12599,8 +12670,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 82,
-                                "end_line": 48,
+                                "end_col": 20,
+                                "end_line": 57,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -12614,12 +12685,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 48,
+                                                "end_line": 54,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 48
+                                                "start_line": 54
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -12628,8 +12699,8 @@
                                     },
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
-                                "start_col": 67,
-                                "start_line": 48
+                                "start_col": 5,
+                                "start_line": 57
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -12654,8 +12725,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 23,
-                                "end_line": 49,
+                                "end_col": 22,
+                                "end_line": 58,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -12669,12 +12740,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 48,
+                                                "end_line": 54,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 48
+                                                "start_line": 54
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -12683,8 +12754,8 @@
                                     },
                                     "While expanding the reference '__calldata_arg_newPublicKey' in:"
                                 ],
-                                "start_col": 5,
-                                "start_line": 49
+                                "start_col": 4,
+                                "start_line": 58
                             },
                             "While handling calldata argument 'newPublicKey'"
                         ],
@@ -12703,12 +12774,12 @@
                     "hints": [],
                     "inst": {
                         "end_col": 18,
-                        "end_line": 48,
+                        "end_line": 54,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 6,
-                        "start_line": 48
+                        "start_line": 54
                     }
                 },
                 "470": {
@@ -12730,12 +12801,12 @@
                                 "parent_location": [
                                     {
                                         "end_col": 18,
-                                        "end_line": 48,
+                                        "end_line": 54,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 6,
-                                        "start_line": 48
+                                        "start_line": 54
                                     },
                                     "While constructing the external wrapper for:"
                                 ],
@@ -12754,12 +12825,12 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 48,
+                                "end_line": 54,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 48
+                                "start_line": 54
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -12785,7 +12856,7 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 48,
+                                "end_line": 54,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -12799,12 +12870,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 48,
+                                                "end_line": 54,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 48
+                                                "start_line": 54
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -12814,7 +12885,7 @@
                                     "While expanding the reference 'syscall_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 48
+                                "start_line": 54
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -12840,7 +12911,7 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 48,
+                                "end_line": 54,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -12854,12 +12925,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 48,
+                                                "end_line": 54,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 48
+                                                "start_line": 54
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -12869,7 +12940,7 @@
                                     "While expanding the reference 'pedersen_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 48
+                                "start_line": 54
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -12895,7 +12966,7 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 48,
+                                "end_line": 54,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -12909,12 +12980,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 48,
+                                                "end_line": 54,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 48
+                                                "start_line": 54
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -12924,7 +12995,7 @@
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 48
+                                "start_line": 54
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -12950,7 +13021,7 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 48,
+                                "end_line": 54,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -12964,12 +13035,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 48,
+                                                "end_line": 54,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 48
+                                                "start_line": 54
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -12979,7 +13050,7 @@
                                     "While expanding the reference 'ecdsa_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 48
+                                "start_line": 54
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -13005,7 +13076,7 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 48,
+                                "end_line": 54,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -13019,12 +13090,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 48,
+                                                "end_line": 54,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 48
+                                                "start_line": 54
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -13034,7 +13105,7 @@
                                     "While expanding the reference 'bitwise_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 48
+                                "start_line": 54
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -13060,7 +13131,7 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 48,
+                                "end_line": 54,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -13074,12 +13145,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 48,
+                                                "end_line": 54,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 48
+                                                "start_line": 54
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -13089,7 +13160,7 @@
                                     "While expanding the reference 'retdata_size' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 48
+                                "start_line": 54
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -13115,7 +13186,7 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 48,
+                                "end_line": 54,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -13129,12 +13200,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 48,
+                                                "end_line": 54,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 48
+                                                "start_line": 54
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -13144,7 +13215,7 @@
                                     "While expanding the reference 'retdata' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 48
+                                "start_line": 54
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -13170,12 +13241,12 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 48,
+                                "end_line": 54,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 48
+                                "start_line": 54
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -13193,7 +13264,7 @@
                     "hints": [],
                     "inst": {
                         "end_col": 23,
-                        "end_line": 61,
+                        "end_line": 69,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
@@ -13202,17 +13273,17 @@
                                 "end_col": 27,
                                 "end_line": 120,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 85,
-                                        "end_line": 63,
+                                        "end_line": 78,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 27,
-                                        "start_line": 63
+                                        "start_line": 78
                                     },
                                     "While trying to retrieve the implicit argument 'syscall_ptr' in:"
                                 ],
@@ -13222,7 +13293,7 @@
                             "While expanding the reference 'syscall_ptr' in:"
                         ],
                         "start_col": 5,
-                        "start_line": 61
+                        "start_line": 69
                     }
                 },
                 "482": {
@@ -13234,8 +13305,8 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 51,
-                        "end_line": 61,
+                        "end_col": 31,
+                        "end_line": 70,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
@@ -13244,17 +13315,17 @@
                                 "end_col": 35,
                                 "end_line": 121,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 85,
-                                        "end_line": 63,
+                                        "end_line": 78,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 27,
-                                        "start_line": 63
+                                        "start_line": 78
                                     },
                                     "While trying to retrieve the implicit argument 'pedersen_ptr' in:"
                                 ],
@@ -13263,8 +13334,8 @@
                             },
                             "While expanding the reference 'pedersen_ptr' in:"
                         ],
-                        "start_col": 25,
-                        "start_line": 61
+                        "start_col": 5,
+                        "start_line": 70
                     }
                 },
                 "483": {
@@ -13276,8 +13347,8 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 81,
-                        "end_line": 61,
+                        "end_col": 33,
+                        "end_line": 71,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
@@ -13286,17 +13357,17 @@
                                 "end_col": 37,
                                 "end_line": 122,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 85,
-                                        "end_line": 63,
+                                        "end_line": 78,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 27,
-                                        "start_line": 63
+                                        "start_line": 78
                                     },
                                     "While trying to retrieve the implicit argument 'ecdsa_ptr' in:"
                                 ],
@@ -13305,8 +13376,8 @@
                             },
                             "While expanding the reference 'ecdsa_ptr' in:"
                         ],
-                        "start_col": 53,
-                        "start_line": 61
+                        "start_col": 5,
+                        "start_line": 71
                     }
                 },
                 "484": {
@@ -13318,8 +13389,8 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 98,
-                        "end_line": 61,
+                        "end_col": 20,
+                        "end_line": 72,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
@@ -13328,17 +13399,17 @@
                                 "end_col": 24,
                                 "end_line": 123,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 85,
-                                        "end_line": 63,
+                                        "end_line": 78,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 27,
-                                        "start_line": 63
+                                        "start_line": 78
                                     },
                                     "While trying to retrieve the implicit argument 'range_check_ptr' in:"
                                 ],
@@ -13347,8 +13418,8 @@
                             },
                             "While expanding the reference 'range_check_ptr' in:"
                         ],
-                        "start_col": 83,
-                        "start_line": 61
+                        "start_col": 5,
+                        "start_line": 72
                     }
                 },
                 "485": {
@@ -13360,25 +13431,25 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 13,
-                        "end_line": 62,
+                        "end_col": 15,
+                        "end_line": 74,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 58,
-                                "end_line": 63,
+                                "end_line": 78,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 54,
-                                "start_line": 63
+                                "start_line": 78
                             },
                             "While expanding the reference 'hash' in:"
                         ],
-                        "start_col": 3,
-                        "start_line": 62
+                        "start_col": 5,
+                        "start_line": 74
                     }
                 },
                 "486": {
@@ -13390,25 +13461,25 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 34,
-                        "end_line": 62,
+                        "end_col": 24,
+                        "end_line": 75,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 73,
-                                "end_line": 63,
+                                "end_line": 78,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 60,
-                                "start_line": 63
+                                "start_line": 78
                             },
                             "While expanding the reference 'signature_len' in:"
                         ],
-                        "start_col": 15,
-                        "start_line": 62
+                        "start_col": 5,
+                        "start_line": 75
                     }
                 },
                 "487": {
@@ -13420,25 +13491,25 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 52,
-                        "end_line": 62,
+                        "end_col": 21,
+                        "end_line": 76,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 84,
-                                "end_line": 63,
+                                "end_line": 78,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 75,
-                                "start_line": 63
+                                "start_line": 78
                             },
                             "While expanding the reference 'signature' in:"
                         ],
-                        "start_col": 36,
-                        "start_line": 62
+                        "start_col": 5,
+                        "start_line": 76
                     }
                 },
                 "488": {
@@ -13451,12 +13522,12 @@
                     "hints": [],
                     "inst": {
                         "end_col": 85,
-                        "end_line": 63,
+                        "end_line": 78,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 27,
-                        "start_line": 63
+                        "start_line": 78
                     }
                 },
                 "490": {
@@ -13469,12 +13540,12 @@
                     "hints": [],
                     "inst": {
                         "end_col": 30,
-                        "end_line": 64,
+                        "end_line": 79,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 5,
-                        "start_line": 64
+                        "start_line": 79
                     }
                 },
                 "491": {
@@ -13496,12 +13567,12 @@
                                 "parent_location": [
                                     {
                                         "end_col": 22,
-                                        "end_line": 60,
+                                        "end_line": 68,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 6,
-                                        "start_line": 60
+                                        "start_line": 68
                                     },
                                     "While handling return value of"
                                 ],
@@ -13520,12 +13591,12 @@
                         "parent_location": [
                             {
                                 "end_col": 22,
-                                "end_line": 60,
+                                "end_line": 68,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 60
+                                "start_line": 68
                             },
                             "While handling return value of"
                         ],
@@ -13550,13 +13621,13 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 71,
-                                "end_line": 62,
+                                "end_col": 20,
+                                "end_line": 77,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
-                                "start_col": 58,
-                                "start_line": 62
+                                "start_col": 7,
+                                "start_line": 77
                             },
                             "While handling return value 'isValid'"
                         ],
@@ -13581,8 +13652,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 71,
-                                "end_line": 62,
+                                "end_col": 20,
+                                "end_line": 77,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -13596,12 +13667,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 22,
-                                                "end_line": 60,
+                                                "end_line": 68,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 60
+                                                "start_line": 68
                                             },
                                             "While handling return value of"
                                         ],
@@ -13610,8 +13681,8 @@
                                     },
                                     "While expanding the reference '__return_value_ptr' in:"
                                 ],
-                                "start_col": 58,
-                                "start_line": 62
+                                "start_col": 7,
+                                "start_line": 77
                             },
                             "While handling return value 'isValid'"
                         ],
@@ -13637,7 +13708,7 @@
                         "parent_location": [
                             {
                                 "end_col": 22,
-                                "end_line": 60,
+                                "end_line": 68,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -13651,12 +13722,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 22,
-                                                "end_line": 60,
+                                                "end_line": 68,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 60
+                                                "start_line": 68
                                             },
                                             "While handling return value of"
                                         ],
@@ -13666,7 +13737,7 @@
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 60
+                                "start_line": 68
                             },
                             "While handling return value of"
                         ],
@@ -13692,12 +13763,12 @@
                         "parent_location": [
                             {
                                 "end_col": 22,
-                                "end_line": 60,
+                                "end_line": 68,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 60
+                                "start_line": 68
                             },
                             "While handling return value of"
                         ],
@@ -13723,7 +13794,7 @@
                         "parent_location": [
                             {
                                 "end_col": 22,
-                                "end_line": 60,
+                                "end_line": 68,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -13737,12 +13808,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 22,
-                                                "end_line": 60,
+                                                "end_line": 68,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 60
+                                                "start_line": 68
                                             },
                                             "While handling return value of"
                                         ],
@@ -13752,7 +13823,7 @@
                                     "While expanding the reference '__return_value_ptr_start' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 60
+                                "start_line": 68
                             },
                             "While handling return value of"
                         ],
@@ -13778,12 +13849,12 @@
                         "parent_location": [
                             {
                                 "end_col": 22,
-                                "end_line": 60,
+                                "end_line": 68,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 60
+                                "start_line": 68
                             },
                             "While handling return value of"
                         ],
@@ -13808,8 +13879,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 98,
-                                "end_line": 61,
+                                "end_col": 20,
+                                "end_line": 72,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -13822,13 +13893,13 @@
                                         },
                                         "parent_location": [
                                             {
-                                                "end_col": 52,
-                                                "end_line": 62,
+                                                "end_col": 21,
+                                                "end_line": 76,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
-                                                "start_col": 36,
-                                                "start_line": 62
+                                                "start_col": 5,
+                                                "start_line": 76
                                             },
                                             "While handling calldata argument 'signature'"
                                         ],
@@ -13837,8 +13908,8 @@
                                     },
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
-                                "start_col": 83,
-                                "start_line": 61
+                                "start_col": 5,
+                                "start_line": 72
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -13863,8 +13934,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 34,
-                                "end_line": 62,
+                                "end_col": 24,
+                                "end_line": 75,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -13877,13 +13948,13 @@
                                         },
                                         "parent_location": [
                                             {
-                                                "end_col": 52,
-                                                "end_line": 62,
+                                                "end_col": 21,
+                                                "end_line": 76,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
-                                                "start_col": 36,
-                                                "start_line": 62
+                                                "start_col": 5,
+                                                "start_line": 76
                                             },
                                             "While handling calldata argument 'signature'"
                                         ],
@@ -13892,8 +13963,8 @@
                                     },
                                     "While expanding the reference '__calldata_arg_signature_len' in:"
                                 ],
-                                "start_col": 15,
-                                "start_line": 62
+                                "start_col": 5,
+                                "start_line": 75
                             },
                             "While handling calldata argument 'signature_len'"
                         ],
@@ -13918,13 +13989,13 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 52,
-                                "end_line": 62,
+                                "end_col": 21,
+                                "end_line": 76,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
-                                "start_col": 36,
-                                "start_line": 62
+                                "start_col": 5,
+                                "start_line": 76
                             },
                             "While handling calldata argument 'signature'"
                         ],
@@ -13949,8 +14020,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 34,
-                                "end_line": 62,
+                                "end_col": 24,
+                                "end_line": 75,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -13963,13 +14034,13 @@
                                         },
                                         "parent_location": [
                                             {
-                                                "end_col": 52,
-                                                "end_line": 62,
+                                                "end_col": 21,
+                                                "end_line": 76,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
-                                                "start_col": 36,
-                                                "start_line": 62
+                                                "start_col": 5,
+                                                "start_line": 76
                                             },
                                             "While handling calldata argument 'signature'"
                                         ],
@@ -13978,8 +14049,8 @@
                                     },
                                     "While expanding the reference '__calldata_ptr' in:"
                                 ],
-                                "start_col": 15,
-                                "start_line": 62
+                                "start_col": 5,
+                                "start_line": 75
                             },
                             "While handling calldata argument 'signature_len'"
                         ],
@@ -14004,8 +14075,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 34,
-                                "end_line": 62,
+                                "end_col": 24,
+                                "end_line": 75,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -14018,13 +14089,13 @@
                                         },
                                         "parent_location": [
                                             {
-                                                "end_col": 52,
-                                                "end_line": 62,
+                                                "end_col": 21,
+                                                "end_line": 76,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
-                                                "start_col": 36,
-                                                "start_line": 62
+                                                "start_col": 5,
+                                                "start_line": 76
                                             },
                                             "While handling calldata argument 'signature'"
                                         ],
@@ -14033,8 +14104,8 @@
                                     },
                                     "While expanding the reference '__calldata_arg_signature_len' in:"
                                 ],
-                                "start_col": 15,
-                                "start_line": 62
+                                "start_col": 5,
+                                "start_line": 75
                             },
                             "While handling calldata argument 'signature_len'"
                         ],
@@ -14059,13 +14130,13 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 52,
-                                "end_line": 62,
+                                "end_col": 21,
+                                "end_line": 76,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
-                                "start_col": 36,
-                                "start_line": 62
+                                "start_col": 5,
+                                "start_line": 76
                             },
                             "While handling calldata argument 'signature'"
                         ],
@@ -14091,12 +14162,12 @@
                         "parent_location": [
                             {
                                 "end_col": 22,
-                                "end_line": 60,
+                                "end_line": 68,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 60
+                                "start_line": 68
                             },
                             "While handling calldata of"
                         ],
@@ -14121,8 +14192,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 98,
-                                "end_line": 61,
+                                "end_col": 20,
+                                "end_line": 72,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -14135,8 +14206,8 @@
                                         },
                                         "parent_location": [
                                             {
-                                                "end_col": 52,
-                                                "end_line": 62,
+                                                "end_col": 21,
+                                                "end_line": 76,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
@@ -14150,12 +14221,12 @@
                                                         "parent_location": [
                                                             {
                                                                 "end_col": 22,
-                                                                "end_line": 60,
+                                                                "end_line": 68,
                                                                 "input_file": {
                                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                                 },
                                                                 "start_col": 6,
-                                                                "start_line": 60
+                                                                "start_line": 68
                                                             },
                                                             "While constructing the external wrapper for:"
                                                         ],
@@ -14164,8 +14235,8 @@
                                                     },
                                                     "While expanding the reference 'range_check_ptr' in:"
                                                 ],
-                                                "start_col": 36,
-                                                "start_line": 62
+                                                "start_col": 5,
+                                                "start_line": 76
                                             },
                                             "While handling calldata argument 'signature'"
                                         ],
@@ -14174,8 +14245,8 @@
                                     },
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
-                                "start_col": 83,
-                                "start_line": 61
+                                "start_col": 5,
+                                "start_line": 72
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -14201,7 +14272,7 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 61,
+                                "end_line": 69,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -14215,12 +14286,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 22,
-                                                "end_line": 60,
+                                                "end_line": 68,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 60
+                                                "start_line": 68
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -14230,7 +14301,7 @@
                                     "While expanding the reference 'syscall_ptr' in:"
                                 ],
                                 "start_col": 5,
-                                "start_line": 61
+                                "start_line": 69
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -14255,8 +14326,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 51,
-                                "end_line": 61,
+                                "end_col": 31,
+                                "end_line": 70,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -14270,12 +14341,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 22,
-                                                "end_line": 60,
+                                                "end_line": 68,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 60
+                                                "start_line": 68
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -14284,8 +14355,8 @@
                                     },
                                     "While expanding the reference 'pedersen_ptr' in:"
                                 ],
-                                "start_col": 25,
-                                "start_line": 61
+                                "start_col": 5,
+                                "start_line": 70
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -14310,8 +14381,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 81,
-                                "end_line": 61,
+                                "end_col": 33,
+                                "end_line": 71,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -14325,12 +14396,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 22,
-                                                "end_line": 60,
+                                                "end_line": 68,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 60
+                                                "start_line": 68
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -14339,8 +14410,8 @@
                                     },
                                     "While expanding the reference 'ecdsa_ptr' in:"
                                 ],
-                                "start_col": 53,
-                                "start_line": 61
+                                "start_col": 5,
+                                "start_line": 71
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -14365,8 +14436,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 52,
-                                "end_line": 62,
+                                "end_col": 21,
+                                "end_line": 76,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -14380,12 +14451,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 22,
-                                                "end_line": 60,
+                                                "end_line": 68,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 60
+                                                "start_line": 68
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -14394,8 +14465,8 @@
                                     },
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
-                                "start_col": 36,
-                                "start_line": 62
+                                "start_col": 5,
+                                "start_line": 76
                             },
                             "While handling calldata argument 'signature'"
                         ],
@@ -14420,8 +14491,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 13,
-                                "end_line": 62,
+                                "end_col": 15,
+                                "end_line": 74,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -14435,12 +14506,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 22,
-                                                "end_line": 60,
+                                                "end_line": 68,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 60
+                                                "start_line": 68
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -14449,8 +14520,8 @@
                                     },
                                     "While expanding the reference '__calldata_arg_hash' in:"
                                 ],
-                                "start_col": 3,
-                                "start_line": 62
+                                "start_col": 5,
+                                "start_line": 74
                             },
                             "While handling calldata argument 'hash'"
                         ],
@@ -14475,8 +14546,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 34,
-                                "end_line": 62,
+                                "end_col": 24,
+                                "end_line": 75,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -14490,12 +14561,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 22,
-                                                "end_line": 60,
+                                                "end_line": 68,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 60
+                                                "start_line": 68
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -14504,8 +14575,8 @@
                                     },
                                     "While expanding the reference '__calldata_arg_signature_len' in:"
                                 ],
-                                "start_col": 15,
-                                "start_line": 62
+                                "start_col": 5,
+                                "start_line": 75
                             },
                             "While handling calldata argument 'signature_len'"
                         ],
@@ -14530,8 +14601,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 52,
-                                "end_line": 62,
+                                "end_col": 21,
+                                "end_line": 76,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -14545,12 +14616,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 22,
-                                                "end_line": 60,
+                                                "end_line": 68,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 60
+                                                "start_line": 68
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -14559,8 +14630,8 @@
                                     },
                                     "While expanding the reference '__calldata_arg_signature' in:"
                                 ],
-                                "start_col": 36,
-                                "start_line": 62
+                                "start_col": 5,
+                                "start_line": 76
                             },
                             "While handling calldata argument 'signature'"
                         ],
@@ -14579,12 +14650,12 @@
                     "hints": [],
                     "inst": {
                         "end_col": 22,
-                        "end_line": 60,
+                        "end_line": 68,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 6,
-                        "start_line": 60
+                        "start_line": 68
                     }
                 },
                 "520": {
@@ -14605,7 +14676,7 @@
                         "parent_location": [
                             {
                                 "end_col": 22,
-                                "end_line": 60,
+                                "end_line": 68,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -14619,12 +14690,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 22,
-                                                "end_line": 60,
+                                                "end_line": 68,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 60
+                                                "start_line": 68
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -14634,7 +14705,7 @@
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 60
+                                "start_line": 68
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -14660,12 +14731,12 @@
                         "parent_location": [
                             {
                                 "end_col": 22,
-                                "end_line": 60,
+                                "end_line": 68,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 60
+                                "start_line": 68
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -14691,7 +14762,7 @@
                         "parent_location": [
                             {
                                 "end_col": 22,
-                                "end_line": 60,
+                                "end_line": 68,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -14705,12 +14776,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 22,
-                                                "end_line": 60,
+                                                "end_line": 68,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 60
+                                                "start_line": 68
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -14720,7 +14791,7 @@
                                     "While expanding the reference 'syscall_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 60
+                                "start_line": 68
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -14746,7 +14817,7 @@
                         "parent_location": [
                             {
                                 "end_col": 22,
-                                "end_line": 60,
+                                "end_line": 68,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -14760,12 +14831,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 22,
-                                                "end_line": 60,
+                                                "end_line": 68,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 60
+                                                "start_line": 68
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -14775,7 +14846,7 @@
                                     "While expanding the reference 'pedersen_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 60
+                                "start_line": 68
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -14801,7 +14872,7 @@
                         "parent_location": [
                             {
                                 "end_col": 22,
-                                "end_line": 60,
+                                "end_line": 68,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -14815,12 +14886,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 22,
-                                                "end_line": 60,
+                                                "end_line": 68,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 60
+                                                "start_line": 68
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -14830,7 +14901,7 @@
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 60
+                                "start_line": 68
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -14856,7 +14927,7 @@
                         "parent_location": [
                             {
                                 "end_col": 22,
-                                "end_line": 60,
+                                "end_line": 68,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -14870,12 +14941,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 22,
-                                                "end_line": 60,
+                                                "end_line": 68,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 60
+                                                "start_line": 68
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -14885,7 +14956,7 @@
                                     "While expanding the reference 'ecdsa_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 60
+                                "start_line": 68
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -14911,7 +14982,7 @@
                         "parent_location": [
                             {
                                 "end_col": 22,
-                                "end_line": 60,
+                                "end_line": 68,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -14925,12 +14996,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 22,
-                                                "end_line": 60,
+                                                "end_line": 68,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 60
+                                                "start_line": 68
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -14940,7 +15011,7 @@
                                     "While expanding the reference 'bitwise_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 60
+                                "start_line": 68
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -14966,7 +15037,7 @@
                         "parent_location": [
                             {
                                 "end_col": 22,
-                                "end_line": 60,
+                                "end_line": 68,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -14980,12 +15051,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 22,
-                                                "end_line": 60,
+                                                "end_line": 68,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 60
+                                                "start_line": 68
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -14995,7 +15066,7 @@
                                     "While expanding the reference 'retdata_size' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 60
+                                "start_line": 68
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -15021,7 +15092,7 @@
                         "parent_location": [
                             {
                                 "end_col": 22,
-                                "end_line": 60,
+                                "end_line": 68,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -15035,12 +15106,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 22,
-                                                "end_line": 60,
+                                                "end_line": 68,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 60
+                                                "start_line": 68
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -15050,7 +15121,7 @@
                                     "While expanding the reference 'retdata' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 60
+                                "start_line": 68
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -15076,12 +15147,12 @@
                         "parent_location": [
                             {
                                 "end_col": 22,
-                                "end_line": 60,
+                                "end_line": 68,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 60
+                                "start_line": 68
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -15099,7 +15170,7 @@
                     "hints": [],
                     "inst": {
                         "end_col": 23,
-                        "end_line": 69,
+                        "end_line": 84,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
@@ -15108,17 +15179,17 @@
                                 "end_col": 36,
                                 "end_line": 438,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 34,
-                                        "end_line": 71,
+                                        "end_line": 94,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 21,
-                                        "start_line": 71
+                                        "start_line": 94
                                     },
                                     "While trying to retrieve the implicit argument 'syscall_ptr' in:"
                                 ],
@@ -15128,7 +15199,7 @@
                             "While expanding the reference 'syscall_ptr' in:"
                         ],
                         "start_col": 5,
-                        "start_line": 69
+                        "start_line": 84
                     }
                 },
                 "532": {
@@ -15141,12 +15212,12 @@
                     "hints": [],
                     "inst": {
                         "end_col": 34,
-                        "end_line": 71,
+                        "end_line": 94,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 21,
-                        "start_line": 71
+                        "start_line": 94
                     }
                 },
                 "534": {
@@ -15161,12 +15232,12 @@
                         "end_col": 36,
                         "end_line": 438,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 34,
-                                "end_line": 71,
+                                "end_line": 94,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -15175,17 +15246,17 @@
                                         "end_col": 27,
                                         "end_line": 120,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 99,
-                                                "end_line": 72,
+                                                "end_line": 95,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 5,
-                                                "start_line": 72
+                                                "start_line": 95
                                             },
                                             "While trying to retrieve the implicit argument 'syscall_ptr' in:"
                                         ],
@@ -15195,7 +15266,7 @@
                                     "While expanding the reference 'syscall_ptr' in:"
                                 ],
                                 "start_col": 21,
-                                "start_line": 71
+                                "start_line": 94
                             },
                             "While trying to update the implicit return value 'syscall_ptr' in:"
                         ],
@@ -15212,8 +15283,8 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 51,
-                        "end_line": 69,
+                        "end_col": 31,
+                        "end_line": 85,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
@@ -15222,17 +15293,17 @@
                                 "end_col": 35,
                                 "end_line": 121,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 99,
-                                        "end_line": 72,
+                                        "end_line": 95,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 5,
-                                        "start_line": 72
+                                        "start_line": 95
                                     },
                                     "While trying to retrieve the implicit argument 'pedersen_ptr' in:"
                                 ],
@@ -15241,8 +15312,8 @@
                             },
                             "While expanding the reference 'pedersen_ptr' in:"
                         ],
-                        "start_col": 25,
-                        "start_line": 69
+                        "start_col": 5,
+                        "start_line": 85
                     }
                 },
                 "536": {
@@ -15254,8 +15325,8 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 81,
-                        "end_line": 69,
+                        "end_col": 33,
+                        "end_line": 86,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
@@ -15264,17 +15335,17 @@
                                 "end_col": 37,
                                 "end_line": 122,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 99,
-                                        "end_line": 72,
+                                        "end_line": 95,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 5,
-                                        "start_line": 72
+                                        "start_line": 95
                                     },
                                     "While trying to retrieve the implicit argument 'ecdsa_ptr' in:"
                                 ],
@@ -15283,8 +15354,8 @@
                             },
                             "While expanding the reference 'ecdsa_ptr' in:"
                         ],
-                        "start_col": 53,
-                        "start_line": 69
+                        "start_col": 5,
+                        "start_line": 86
                     }
                 },
                 "537": {
@@ -15296,8 +15367,8 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 98,
-                        "end_line": 69,
+                        "end_col": 20,
+                        "end_line": 87,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
@@ -15306,17 +15377,17 @@
                                 "end_col": 24,
                                 "end_line": 123,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 99,
-                                        "end_line": 72,
+                                        "end_line": 95,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 5,
-                                        "start_line": 72
+                                        "start_line": 95
                                     },
                                     "While trying to retrieve the implicit argument 'range_check_ptr' in:"
                                 ],
@@ -15325,8 +15396,8 @@
                             },
                             "While expanding the reference 'range_check_ptr' in:"
                         ],
-                        "start_col": 83,
-                        "start_line": 69
+                        "start_col": 5,
+                        "start_line": 87
                     }
                 },
                 "538": {
@@ -15339,12 +15410,12 @@
                     "hints": [],
                     "inst": {
                         "end_col": 56,
-                        "end_line": 72,
+                        "end_line": 95,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 32,
-                        "start_line": 72
+                        "start_line": 95
                     }
                 },
                 "539": {
@@ -15357,12 +15428,12 @@
                     "hints": [],
                     "inst": {
                         "end_col": 79,
-                        "end_line": 72,
+                        "end_line": 95,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 58,
-                        "start_line": 72
+                        "start_line": 95
                     }
                 },
                 "540": {
@@ -15375,12 +15446,12 @@
                     "hints": [],
                     "inst": {
                         "end_col": 98,
-                        "end_line": 72,
+                        "end_line": 95,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 81,
-                        "start_line": 72
+                        "start_line": 95
                     }
                 },
                 "541": {
@@ -15393,12 +15464,12 @@
                     "hints": [],
                     "inst": {
                         "end_col": 99,
-                        "end_line": 72,
+                        "end_line": 95,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 5,
-                        "start_line": 72
+                        "start_line": 95
                     }
                 },
                 "543": {
@@ -15413,41 +15484,41 @@
                         "end_col": 27,
                         "end_line": 120,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 99,
-                                "end_line": 72,
+                                "end_line": 95,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 23,
-                                        "end_line": 69,
+                                        "end_line": 84,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 15,
-                                                "end_line": 73,
+                                                "end_line": 96,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 5,
-                                                "start_line": 73
+                                                "start_line": 96
                                             },
                                             "While trying to retrieve the implicit argument 'syscall_ptr' in:"
                                         ],
                                         "start_col": 5,
-                                        "start_line": 69
+                                        "start_line": 84
                                     },
                                     "While expanding the reference 'syscall_ptr' in:"
                                 ],
                                 "start_col": 5,
-                                "start_line": 72
+                                "start_line": 95
                             },
                             "While trying to update the implicit return value 'syscall_ptr' in:"
                         ],
@@ -15467,41 +15538,41 @@
                         "end_col": 35,
                         "end_line": 121,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 99,
-                                "end_line": 72,
+                                "end_line": 95,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 51,
-                                        "end_line": 69,
+                                        "end_col": 31,
+                                        "end_line": 85,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 15,
-                                                "end_line": 73,
+                                                "end_line": 96,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 5,
-                                                "start_line": 73
+                                                "start_line": 96
                                             },
                                             "While trying to retrieve the implicit argument 'pedersen_ptr' in:"
                                         ],
-                                        "start_col": 25,
-                                        "start_line": 69
+                                        "start_col": 5,
+                                        "start_line": 85
                                     },
                                     "While expanding the reference 'pedersen_ptr' in:"
                                 ],
                                 "start_col": 5,
-                                "start_line": 72
+                                "start_line": 95
                             },
                             "While trying to update the implicit return value 'pedersen_ptr' in:"
                         ],
@@ -15521,41 +15592,41 @@
                         "end_col": 37,
                         "end_line": 122,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 99,
-                                "end_line": 72,
+                                "end_line": 95,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 81,
-                                        "end_line": 69,
+                                        "end_col": 33,
+                                        "end_line": 86,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 15,
-                                                "end_line": 73,
+                                                "end_line": 96,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 5,
-                                                "start_line": 73
+                                                "start_line": 96
                                             },
                                             "While trying to retrieve the implicit argument 'ecdsa_ptr' in:"
                                         ],
-                                        "start_col": 53,
-                                        "start_line": 69
+                                        "start_col": 5,
+                                        "start_line": 86
                                     },
                                     "While expanding the reference 'ecdsa_ptr' in:"
                                 ],
                                 "start_col": 5,
-                                "start_line": 72
+                                "start_line": 95
                             },
                             "While trying to update the implicit return value 'ecdsa_ptr' in:"
                         ],
@@ -15575,41 +15646,41 @@
                         "end_col": 24,
                         "end_line": 123,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 99,
-                                "end_line": 72,
+                                "end_line": 95,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 98,
-                                        "end_line": 69,
+                                        "end_col": 20,
+                                        "end_line": 87,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 15,
-                                                "end_line": 73,
+                                                "end_line": 96,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 5,
-                                                "start_line": 73
+                                                "start_line": 96
                                             },
                                             "While trying to retrieve the implicit argument 'range_check_ptr' in:"
                                         ],
-                                        "start_col": 83,
-                                        "start_line": 69
+                                        "start_col": 5,
+                                        "start_line": 87
                                     },
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
                                 "start_col": 5,
-                                "start_line": 72
+                                "start_line": 95
                             },
                             "While trying to update the implicit return value 'range_check_ptr' in:"
                         ],
@@ -15627,12 +15698,12 @@
                     "hints": [],
                     "inst": {
                         "end_col": 15,
-                        "end_line": 73,
+                        "end_line": 96,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 5,
-                        "start_line": 73
+                        "start_line": 96
                     }
                 },
                 "548": {
@@ -15652,8 +15723,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 98,
-                                "end_line": 69,
+                                "end_col": 20,
+                                "end_line": 87,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -15666,13 +15737,13 @@
                                         },
                                         "parent_location": [
                                             {
-                                                "end_col": 54,
-                                                "end_line": 70,
+                                                "end_col": 34,
+                                                "end_line": 90,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
-                                                "start_col": 25,
-                                                "start_line": 70
+                                                "start_col": 5,
+                                                "start_line": 90
                                             },
                                             "While handling calldata argument 'call_array'"
                                         ],
@@ -15681,8 +15752,8 @@
                                     },
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
-                                "start_col": 83,
-                                "start_line": 69
+                                "start_col": 5,
+                                "start_line": 87
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -15707,8 +15778,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 23,
-                                "end_line": 70,
+                                "end_col": 25,
+                                "end_line": 89,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -15721,13 +15792,13 @@
                                         },
                                         "parent_location": [
                                             {
-                                                "end_col": 54,
-                                                "end_line": 70,
+                                                "end_col": 34,
+                                                "end_line": 90,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
-                                                "start_col": 25,
-                                                "start_line": 70
+                                                "start_col": 5,
+                                                "start_line": 90
                                             },
                                             "While handling calldata argument 'call_array'"
                                         ],
@@ -15736,8 +15807,8 @@
                                     },
                                     "While expanding the reference '__calldata_arg_call_array_len' in:"
                                 ],
-                                "start_col": 3,
-                                "start_line": 70
+                                "start_col": 5,
+                                "start_line": 89
                             },
                             "While handling calldata argument 'call_array_len'"
                         ],
@@ -15762,13 +15833,13 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 54,
-                                "end_line": 70,
+                                "end_col": 34,
+                                "end_line": 90,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
-                                "start_col": 25,
-                                "start_line": 70
+                                "start_col": 5,
+                                "start_line": 90
                             },
                             "While handling calldata argument 'call_array'"
                         ],
@@ -15793,8 +15864,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 23,
-                                "end_line": 70,
+                                "end_col": 25,
+                                "end_line": 89,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -15807,13 +15878,13 @@
                                         },
                                         "parent_location": [
                                             {
-                                                "end_col": 54,
-                                                "end_line": 70,
+                                                "end_col": 34,
+                                                "end_line": 90,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
-                                                "start_col": 25,
-                                                "start_line": 70
+                                                "start_col": 5,
+                                                "start_line": 90
                                             },
                                             "While handling calldata argument 'call_array'"
                                         ],
@@ -15822,8 +15893,8 @@
                                     },
                                     "While expanding the reference '__calldata_ptr' in:"
                                 ],
-                                "start_col": 3,
-                                "start_line": 70
+                                "start_col": 5,
+                                "start_line": 89
                             },
                             "While handling calldata argument 'call_array_len'"
                         ],
@@ -15848,8 +15919,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 23,
-                                "end_line": 70,
+                                "end_col": 25,
+                                "end_line": 89,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -15862,13 +15933,13 @@
                                         },
                                         "parent_location": [
                                             {
-                                                "end_col": 54,
-                                                "end_line": 70,
+                                                "end_col": 34,
+                                                "end_line": 90,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
-                                                "start_col": 25,
-                                                "start_line": 70
+                                                "start_col": 5,
+                                                "start_line": 90
                                             },
                                             "While handling calldata argument 'call_array'"
                                         ],
@@ -15877,8 +15948,8 @@
                                     },
                                     "While expanding the reference '__calldata_arg_call_array_len' in:"
                                 ],
-                                "start_col": 3,
-                                "start_line": 70
+                                "start_col": 5,
+                                "start_line": 89
                             },
                             "While handling calldata argument 'call_array_len'"
                         ],
@@ -15903,13 +15974,13 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 54,
-                                "end_line": 70,
+                                "end_col": 34,
+                                "end_line": 90,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
-                                "start_col": 25,
-                                "start_line": 70
+                                "start_col": 5,
+                                "start_line": 90
                             },
                             "While handling calldata argument 'call_array'"
                         ],
@@ -15934,13 +16005,13 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 54,
-                                "end_line": 70,
+                                "end_col": 34,
+                                "end_line": 90,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
-                                "start_col": 25,
-                                "start_line": 70
+                                "start_col": 5,
+                                "start_line": 90
                             },
                             "While handling calldata argument 'call_array'"
                         ],
@@ -15965,8 +16036,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 98,
-                                "end_line": 69,
+                                "end_col": 20,
+                                "end_line": 87,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -15979,8 +16050,8 @@
                                         },
                                         "parent_location": [
                                             {
-                                                "end_col": 54,
-                                                "end_line": 70,
+                                                "end_col": 34,
+                                                "end_line": 90,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
@@ -15993,13 +16064,13 @@
                                                         },
                                                         "parent_location": [
                                                             {
-                                                                "end_col": 91,
-                                                                "end_line": 70,
+                                                                "end_col": 20,
+                                                                "end_line": 92,
                                                                 "input_file": {
                                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                                 },
-                                                                "start_col": 76,
-                                                                "start_line": 70
+                                                                "start_col": 5,
+                                                                "start_line": 92
                                                             },
                                                             "While handling calldata argument 'calldata'"
                                                         ],
@@ -16008,8 +16079,8 @@
                                                     },
                                                     "While expanding the reference 'range_check_ptr' in:"
                                                 ],
-                                                "start_col": 25,
-                                                "start_line": 70
+                                                "start_col": 5,
+                                                "start_line": 90
                                             },
                                             "While handling calldata argument 'call_array'"
                                         ],
@@ -16018,8 +16089,8 @@
                                     },
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
-                                "start_col": 83,
-                                "start_line": 69
+                                "start_col": 5,
+                                "start_line": 87
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -16044,8 +16115,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 74,
-                                "end_line": 70,
+                                "end_col": 23,
+                                "end_line": 91,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -16058,13 +16129,13 @@
                                         },
                                         "parent_location": [
                                             {
-                                                "end_col": 91,
-                                                "end_line": 70,
+                                                "end_col": 20,
+                                                "end_line": 92,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
-                                                "start_col": 76,
-                                                "start_line": 70
+                                                "start_col": 5,
+                                                "start_line": 92
                                             },
                                             "While handling calldata argument 'calldata'"
                                         ],
@@ -16073,8 +16144,8 @@
                                     },
                                     "While expanding the reference '__calldata_arg_calldata_len' in:"
                                 ],
-                                "start_col": 56,
-                                "start_line": 70
+                                "start_col": 5,
+                                "start_line": 91
                             },
                             "While handling calldata argument 'calldata_len'"
                         ],
@@ -16099,13 +16170,13 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 91,
-                                "end_line": 70,
+                                "end_col": 20,
+                                "end_line": 92,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
-                                "start_col": 76,
-                                "start_line": 70
+                                "start_col": 5,
+                                "start_line": 92
                             },
                             "While handling calldata argument 'calldata'"
                         ],
@@ -16130,8 +16201,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 74,
-                                "end_line": 70,
+                                "end_col": 23,
+                                "end_line": 91,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -16144,13 +16215,13 @@
                                         },
                                         "parent_location": [
                                             {
-                                                "end_col": 91,
-                                                "end_line": 70,
+                                                "end_col": 20,
+                                                "end_line": 92,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
-                                                "start_col": 76,
-                                                "start_line": 70
+                                                "start_col": 5,
+                                                "start_line": 92
                                             },
                                             "While handling calldata argument 'calldata'"
                                         ],
@@ -16159,8 +16230,8 @@
                                     },
                                     "While expanding the reference '__calldata_ptr' in:"
                                 ],
-                                "start_col": 56,
-                                "start_line": 70
+                                "start_col": 5,
+                                "start_line": 91
                             },
                             "While handling calldata argument 'calldata_len'"
                         ],
@@ -16185,8 +16256,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 74,
-                                "end_line": 70,
+                                "end_col": 23,
+                                "end_line": 91,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -16199,13 +16270,13 @@
                                         },
                                         "parent_location": [
                                             {
-                                                "end_col": 91,
-                                                "end_line": 70,
+                                                "end_col": 20,
+                                                "end_line": 92,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
-                                                "start_col": 76,
-                                                "start_line": 70
+                                                "start_col": 5,
+                                                "start_line": 92
                                             },
                                             "While handling calldata argument 'calldata'"
                                         ],
@@ -16214,8 +16285,8 @@
                                     },
                                     "While expanding the reference '__calldata_arg_calldata_len' in:"
                                 ],
-                                "start_col": 56,
-                                "start_line": 70
+                                "start_col": 5,
+                                "start_line": 91
                             },
                             "While handling calldata argument 'calldata_len'"
                         ],
@@ -16240,13 +16311,13 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 91,
-                                "end_line": 70,
+                                "end_col": 20,
+                                "end_line": 92,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
-                                "start_col": 76,
-                                "start_line": 70
+                                "start_col": 5,
+                                "start_line": 92
                             },
                             "While handling calldata argument 'calldata'"
                         ],
@@ -16272,12 +16343,12 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 68,
+                                "end_line": 83,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 68
+                                "start_line": 83
                             },
                             "While handling calldata of"
                         ],
@@ -16302,8 +16373,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 98,
-                                "end_line": 69,
+                                "end_col": 20,
+                                "end_line": 87,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -16316,8 +16387,8 @@
                                         },
                                         "parent_location": [
                                             {
-                                                "end_col": 54,
-                                                "end_line": 70,
+                                                "end_col": 34,
+                                                "end_line": 90,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
@@ -16330,8 +16401,8 @@
                                                         },
                                                         "parent_location": [
                                                             {
-                                                                "end_col": 91,
-                                                                "end_line": 70,
+                                                                "end_col": 20,
+                                                                "end_line": 92,
                                                                 "input_file": {
                                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                                 },
@@ -16345,12 +16416,12 @@
                                                                         "parent_location": [
                                                                             {
                                                                                 "end_col": 18,
-                                                                                "end_line": 68,
+                                                                                "end_line": 83,
                                                                                 "input_file": {
                                                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                                                 },
                                                                                 "start_col": 6,
-                                                                                "start_line": 68
+                                                                                "start_line": 83
                                                                             },
                                                                             "While constructing the external wrapper for:"
                                                                         ],
@@ -16359,8 +16430,8 @@
                                                                     },
                                                                     "While expanding the reference 'range_check_ptr' in:"
                                                                 ],
-                                                                "start_col": 76,
-                                                                "start_line": 70
+                                                                "start_col": 5,
+                                                                "start_line": 92
                                                             },
                                                             "While handling calldata argument 'calldata'"
                                                         ],
@@ -16369,8 +16440,8 @@
                                                     },
                                                     "While expanding the reference 'range_check_ptr' in:"
                                                 ],
-                                                "start_col": 25,
-                                                "start_line": 70
+                                                "start_col": 5,
+                                                "start_line": 90
                                             },
                                             "While handling calldata argument 'call_array'"
                                         ],
@@ -16379,8 +16450,8 @@
                                     },
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
-                                "start_col": 83,
-                                "start_line": 69
+                                "start_col": 5,
+                                "start_line": 87
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -16406,7 +16477,7 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 69,
+                                "end_line": 84,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -16420,12 +16491,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 68,
+                                                "end_line": 83,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 68
+                                                "start_line": 83
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -16435,7 +16506,7 @@
                                     "While expanding the reference 'syscall_ptr' in:"
                                 ],
                                 "start_col": 5,
-                                "start_line": 69
+                                "start_line": 84
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -16460,8 +16531,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 51,
-                                "end_line": 69,
+                                "end_col": 31,
+                                "end_line": 85,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -16475,12 +16546,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 68,
+                                                "end_line": 83,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 68
+                                                "start_line": 83
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -16489,8 +16560,8 @@
                                     },
                                     "While expanding the reference 'pedersen_ptr' in:"
                                 ],
-                                "start_col": 25,
-                                "start_line": 69
+                                "start_col": 5,
+                                "start_line": 85
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -16515,8 +16586,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 81,
-                                "end_line": 69,
+                                "end_col": 33,
+                                "end_line": 86,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -16530,12 +16601,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 68,
+                                                "end_line": 83,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 68
+                                                "start_line": 83
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -16544,8 +16615,8 @@
                                     },
                                     "While expanding the reference 'ecdsa_ptr' in:"
                                 ],
-                                "start_col": 53,
-                                "start_line": 69
+                                "start_col": 5,
+                                "start_line": 86
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -16570,8 +16641,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 91,
-                                "end_line": 70,
+                                "end_col": 20,
+                                "end_line": 92,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -16585,12 +16656,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 68,
+                                                "end_line": 83,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 68
+                                                "start_line": 83
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -16599,8 +16670,8 @@
                                     },
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
-                                "start_col": 76,
-                                "start_line": 70
+                                "start_col": 5,
+                                "start_line": 92
                             },
                             "While handling calldata argument 'calldata'"
                         ],
@@ -16625,8 +16696,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 23,
-                                "end_line": 70,
+                                "end_col": 25,
+                                "end_line": 89,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -16640,12 +16711,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 68,
+                                                "end_line": 83,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 68
+                                                "start_line": 83
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -16654,8 +16725,8 @@
                                     },
                                     "While expanding the reference '__calldata_arg_call_array_len' in:"
                                 ],
-                                "start_col": 3,
-                                "start_line": 70
+                                "start_col": 5,
+                                "start_line": 89
                             },
                             "While handling calldata argument 'call_array_len'"
                         ],
@@ -16680,8 +16751,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 54,
-                                "end_line": 70,
+                                "end_col": 34,
+                                "end_line": 90,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -16695,12 +16766,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 68,
+                                                "end_line": 83,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 68
+                                                "start_line": 83
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -16709,8 +16780,8 @@
                                     },
                                     "While expanding the reference '__calldata_arg_call_array' in:"
                                 ],
-                                "start_col": 25,
-                                "start_line": 70
+                                "start_col": 5,
+                                "start_line": 90
                             },
                             "While handling calldata argument 'call_array'"
                         ],
@@ -16735,8 +16806,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 74,
-                                "end_line": 70,
+                                "end_col": 23,
+                                "end_line": 91,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -16750,12 +16821,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 68,
+                                                "end_line": 83,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 68
+                                                "start_line": 83
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -16764,8 +16835,8 @@
                                     },
                                     "While expanding the reference '__calldata_arg_calldata_len' in:"
                                 ],
-                                "start_col": 56,
-                                "start_line": 70
+                                "start_col": 5,
+                                "start_line": 91
                             },
                             "While handling calldata argument 'calldata_len'"
                         ],
@@ -16790,8 +16861,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 91,
-                                "end_line": 70,
+                                "end_col": 20,
+                                "end_line": 92,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -16805,12 +16876,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 68,
+                                                "end_line": 83,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 68
+                                                "start_line": 83
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -16819,8 +16890,8 @@
                                     },
                                     "While expanding the reference '__calldata_arg_calldata' in:"
                                 ],
-                                "start_col": 76,
-                                "start_line": 70
+                                "start_col": 5,
+                                "start_line": 92
                             },
                             "While handling calldata argument 'calldata'"
                         ],
@@ -16839,12 +16910,12 @@
                     "hints": [],
                     "inst": {
                         "end_col": 18,
-                        "end_line": 68,
+                        "end_line": 83,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 6,
-                        "start_line": 68
+                        "start_line": 83
                     }
                 },
                 "579": {
@@ -16866,12 +16937,12 @@
                                 "parent_location": [
                                     {
                                         "end_col": 18,
-                                        "end_line": 68,
+                                        "end_line": 83,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 6,
-                                        "start_line": 68
+                                        "start_line": 83
                                     },
                                     "While constructing the external wrapper for:"
                                 ],
@@ -16890,12 +16961,12 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 68,
+                                "end_line": 83,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 68
+                                "start_line": 83
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -16921,7 +16992,7 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 68,
+                                "end_line": 83,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -16935,12 +17006,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 68,
+                                                "end_line": 83,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 68
+                                                "start_line": 83
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -16950,7 +17021,7 @@
                                     "While expanding the reference 'syscall_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 68
+                                "start_line": 83
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -16976,7 +17047,7 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 68,
+                                "end_line": 83,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -16990,12 +17061,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 68,
+                                                "end_line": 83,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 68
+                                                "start_line": 83
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -17005,7 +17076,7 @@
                                     "While expanding the reference 'pedersen_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 68
+                                "start_line": 83
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -17031,7 +17102,7 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 68,
+                                "end_line": 83,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -17045,12 +17116,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 68,
+                                                "end_line": 83,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 68
+                                                "start_line": 83
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -17060,7 +17131,7 @@
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 68
+                                "start_line": 83
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -17086,7 +17157,7 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 68,
+                                "end_line": 83,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -17100,12 +17171,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 68,
+                                                "end_line": 83,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 68
+                                                "start_line": 83
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -17115,7 +17186,7 @@
                                     "While expanding the reference 'ecdsa_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 68
+                                "start_line": 83
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -17141,7 +17212,7 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 68,
+                                "end_line": 83,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -17155,12 +17226,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 68,
+                                                "end_line": 83,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 68
+                                                "start_line": 83
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -17170,7 +17241,7 @@
                                     "While expanding the reference 'bitwise_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 68
+                                "start_line": 83
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -17196,7 +17267,7 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 68,
+                                "end_line": 83,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -17210,12 +17281,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 68,
+                                                "end_line": 83,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 68
+                                                "start_line": 83
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -17225,7 +17296,7 @@
                                     "While expanding the reference 'retdata_size' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 68
+                                "start_line": 83
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -17251,7 +17322,7 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 68,
+                                "end_line": 83,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -17265,12 +17336,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 18,
-                                                "end_line": 68,
+                                                "end_line": 83,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 68
+                                                "start_line": 83
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -17280,7 +17351,7 @@
                                     "While expanding the reference 'retdata' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 68
+                                "start_line": 83
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -17306,12 +17377,12 @@
                         "parent_location": [
                             {
                                 "end_col": 18,
-                                "end_line": 68,
+                                "end_line": 83,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 68
+                                "start_line": 83
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -17329,7 +17400,7 @@
                     "hints": [],
                     "inst": {
                         "end_col": 23,
-                        "end_line": 78,
+                        "end_line": 101,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
@@ -17338,17 +17409,17 @@
                                 "end_col": 36,
                                 "end_line": 438,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 34,
-                                        "end_line": 80,
+                                        "end_line": 106,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 21,
-                                        "start_line": 80
+                                        "start_line": 106
                                     },
                                     "While trying to retrieve the implicit argument 'syscall_ptr' in:"
                                 ],
@@ -17358,7 +17429,7 @@
                             "While expanding the reference 'syscall_ptr' in:"
                         ],
                         "start_col": 5,
-                        "start_line": 78
+                        "start_line": 101
                     }
                 },
                 "591": {
@@ -17371,12 +17442,12 @@
                     "hints": [],
                     "inst": {
                         "end_col": 34,
-                        "end_line": 80,
+                        "end_line": 106,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 21,
-                        "start_line": 80
+                        "start_line": 106
                     }
                 },
                 "593": {
@@ -17391,12 +17462,12 @@
                         "end_col": 36,
                         "end_line": 438,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/env/lib/python3.9/site-packages/starkware/starknet/common/syscalls.cairo"
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 34,
-                                "end_line": 80,
+                                "end_line": 106,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -17405,17 +17476,17 @@
                                         "end_col": 27,
                                         "end_line": 120,
                                         "input_file": {
-                                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 99,
-                                                "end_line": 81,
+                                                "end_line": 107,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 5,
-                                                "start_line": 81
+                                                "start_line": 107
                                             },
                                             "While trying to retrieve the implicit argument 'syscall_ptr' in:"
                                         ],
@@ -17425,7 +17496,7 @@
                                     "While expanding the reference 'syscall_ptr' in:"
                                 ],
                                 "start_col": 21,
-                                "start_line": 80
+                                "start_line": 106
                             },
                             "While trying to update the implicit return value 'syscall_ptr' in:"
                         ],
@@ -17442,8 +17513,8 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 51,
-                        "end_line": 78,
+                        "end_col": 31,
+                        "end_line": 102,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
@@ -17452,17 +17523,17 @@
                                 "end_col": 35,
                                 "end_line": 121,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 99,
-                                        "end_line": 81,
+                                        "end_line": 107,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 5,
-                                        "start_line": 81
+                                        "start_line": 107
                                     },
                                     "While trying to retrieve the implicit argument 'pedersen_ptr' in:"
                                 ],
@@ -17471,8 +17542,8 @@
                             },
                             "While expanding the reference 'pedersen_ptr' in:"
                         ],
-                        "start_col": 25,
-                        "start_line": 78
+                        "start_col": 5,
+                        "start_line": 102
                     }
                 },
                 "595": {
@@ -17484,8 +17555,8 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 81,
-                        "end_line": 78,
+                        "end_col": 33,
+                        "end_line": 103,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
@@ -17494,17 +17565,17 @@
                                 "end_col": 37,
                                 "end_line": 122,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 99,
-                                        "end_line": 81,
+                                        "end_line": 107,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 5,
-                                        "start_line": 81
+                                        "start_line": 107
                                     },
                                     "While trying to retrieve the implicit argument 'ecdsa_ptr' in:"
                                 ],
@@ -17513,8 +17584,8 @@
                             },
                             "While expanding the reference 'ecdsa_ptr' in:"
                         ],
-                        "start_col": 53,
-                        "start_line": 78
+                        "start_col": 5,
+                        "start_line": 103
                     }
                 },
                 "596": {
@@ -17526,8 +17597,8 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 98,
-                        "end_line": 78,
+                        "end_col": 20,
+                        "end_line": 104,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
@@ -17536,17 +17607,17 @@
                                 "end_col": 24,
                                 "end_line": 123,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 99,
-                                        "end_line": 81,
+                                        "end_line": 107,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 5,
-                                        "start_line": 81
+                                        "start_line": 107
                                     },
                                     "While trying to retrieve the implicit argument 'range_check_ptr' in:"
                                 ],
@@ -17555,8 +17626,8 @@
                             },
                             "While expanding the reference 'range_check_ptr' in:"
                         ],
-                        "start_col": 83,
-                        "start_line": 78
+                        "start_col": 5,
+                        "start_line": 104
                     }
                 },
                 "597": {
@@ -17569,12 +17640,12 @@
                     "hints": [],
                     "inst": {
                         "end_col": 56,
-                        "end_line": 81,
+                        "end_line": 107,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 32,
-                        "start_line": 81
+                        "start_line": 107
                     }
                 },
                 "598": {
@@ -17587,12 +17658,12 @@
                     "hints": [],
                     "inst": {
                         "end_col": 79,
-                        "end_line": 81,
+                        "end_line": 107,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 58,
-                        "start_line": 81
+                        "start_line": 107
                     }
                 },
                 "599": {
@@ -17605,12 +17676,12 @@
                     "hints": [],
                     "inst": {
                         "end_col": 98,
-                        "end_line": 81,
+                        "end_line": 107,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 81,
-                        "start_line": 81
+                        "start_line": 107
                     }
                 },
                 "600": {
@@ -17623,12 +17694,12 @@
                     "hints": [],
                     "inst": {
                         "end_col": 99,
-                        "end_line": 81,
+                        "end_line": 107,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 5,
-                        "start_line": 81
+                        "start_line": 107
                     }
                 },
                 "602": {
@@ -17643,41 +17714,41 @@
                         "end_col": 27,
                         "end_line": 120,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 99,
-                                "end_line": 81,
+                                "end_line": 107,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 23,
-                                        "end_line": 78,
+                                        "end_line": 101,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 15,
-                                                "end_line": 82,
+                                                "end_line": 108,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 5,
-                                                "start_line": 82
+                                                "start_line": 108
                                             },
                                             "While trying to retrieve the implicit argument 'syscall_ptr' in:"
                                         ],
                                         "start_col": 5,
-                                        "start_line": 78
+                                        "start_line": 101
                                     },
                                     "While expanding the reference 'syscall_ptr' in:"
                                 ],
                                 "start_col": 5,
-                                "start_line": 81
+                                "start_line": 107
                             },
                             "While trying to update the implicit return value 'syscall_ptr' in:"
                         ],
@@ -17697,41 +17768,41 @@
                         "end_col": 35,
                         "end_line": 121,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 99,
-                                "end_line": 81,
+                                "end_line": 107,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 51,
-                                        "end_line": 78,
+                                        "end_col": 31,
+                                        "end_line": 102,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 15,
-                                                "end_line": 82,
+                                                "end_line": 108,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 5,
-                                                "start_line": 82
+                                                "start_line": 108
                                             },
                                             "While trying to retrieve the implicit argument 'pedersen_ptr' in:"
                                         ],
-                                        "start_col": 25,
-                                        "start_line": 78
+                                        "start_col": 5,
+                                        "start_line": 102
                                     },
                                     "While expanding the reference 'pedersen_ptr' in:"
                                 ],
                                 "start_col": 5,
-                                "start_line": 81
+                                "start_line": 107
                             },
                             "While trying to update the implicit return value 'pedersen_ptr' in:"
                         ],
@@ -17751,41 +17822,41 @@
                         "end_col": 37,
                         "end_line": 122,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 99,
-                                "end_line": 81,
+                                "end_line": 107,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 81,
-                                        "end_line": 78,
+                                        "end_col": 33,
+                                        "end_line": 103,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 15,
-                                                "end_line": 82,
+                                                "end_line": 108,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 5,
-                                                "start_line": 82
+                                                "start_line": 108
                                             },
                                             "While trying to retrieve the implicit argument 'ecdsa_ptr' in:"
                                         ],
-                                        "start_col": 53,
-                                        "start_line": 78
+                                        "start_col": 5,
+                                        "start_line": 103
                                     },
                                     "While expanding the reference 'ecdsa_ptr' in:"
                                 ],
                                 "start_col": 5,
-                                "start_line": 81
+                                "start_line": 107
                             },
                             "While trying to update the implicit return value 'ecdsa_ptr' in:"
                         ],
@@ -17805,41 +17876,41 @@
                         "end_col": 24,
                         "end_line": 123,
                         "input_file": {
-                            "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 99,
-                                "end_line": 81,
+                                "end_line": 107,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 98,
-                                        "end_line": 78,
+                                        "end_col": 20,
+                                        "end_line": 104,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "parent_location": [
                                             {
                                                 "end_col": 15,
-                                                "end_line": 82,
+                                                "end_line": 108,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 5,
-                                                "start_line": 82
+                                                "start_line": 108
                                             },
                                             "While trying to retrieve the implicit argument 'range_check_ptr' in:"
                                         ],
-                                        "start_col": 83,
-                                        "start_line": 78
+                                        "start_col": 5,
+                                        "start_line": 104
                                     },
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
                                 "start_col": 5,
-                                "start_line": 81
+                                "start_line": 107
                             },
                             "While trying to update the implicit return value 'range_check_ptr' in:"
                         ],
@@ -17857,12 +17928,12 @@
                     "hints": [],
                     "inst": {
                         "end_col": 15,
-                        "end_line": 82,
+                        "end_line": 108,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 5,
-                        "start_line": 82
+                        "start_line": 108
                     }
                 },
                 "607": {
@@ -17882,8 +17953,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 19,
-                                "end_line": 79,
+                                "end_col": 20,
+                                "end_line": 105,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -17897,7 +17968,7 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 26,
-                                                "end_line": 77,
+                                                "end_line": 100,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
@@ -17911,12 +17982,12 @@
                                                         "parent_location": [
                                                             {
                                                                 "end_col": 26,
-                                                                "end_line": 77,
+                                                                "end_line": 100,
                                                                 "input_file": {
                                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                                 },
                                                                 "start_col": 6,
-                                                                "start_line": 77
+                                                                "start_line": 100
                                                             },
                                                             "While handling calldata of"
                                                         ],
@@ -17926,7 +17997,7 @@
                                                     "While expanding the reference '__calldata_actual_size' in:"
                                                 ],
                                                 "start_col": 6,
-                                                "start_line": 77
+                                                "start_line": 100
                                             },
                                             "While handling calldata of"
                                         ],
@@ -17935,8 +18006,8 @@
                                     },
                                     "While expanding the reference '__calldata_ptr' in:"
                                 ],
-                                "start_col": 3,
-                                "start_line": 79
+                                "start_col": 4,
+                                "start_line": 105
                             },
                             "While handling calldata argument 'class_hash'"
                         ],
@@ -17962,12 +18033,12 @@
                         "parent_location": [
                             {
                                 "end_col": 26,
-                                "end_line": 77,
+                                "end_line": 100,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 77
+                                "start_line": 100
                             },
                             "While handling calldata of"
                         ],
@@ -17993,7 +18064,7 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 78,
+                                "end_line": 101,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -18007,12 +18078,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 26,
-                                                "end_line": 77,
+                                                "end_line": 100,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 77
+                                                "start_line": 100
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -18022,7 +18093,7 @@
                                     "While expanding the reference 'syscall_ptr' in:"
                                 ],
                                 "start_col": 5,
-                                "start_line": 78
+                                "start_line": 101
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -18047,8 +18118,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 51,
-                                "end_line": 78,
+                                "end_col": 31,
+                                "end_line": 102,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -18062,12 +18133,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 26,
-                                                "end_line": 77,
+                                                "end_line": 100,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 77
+                                                "start_line": 100
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -18076,8 +18147,8 @@
                                     },
                                     "While expanding the reference 'pedersen_ptr' in:"
                                 ],
-                                "start_col": 25,
-                                "start_line": 78
+                                "start_col": 5,
+                                "start_line": 102
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -18102,8 +18173,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 81,
-                                "end_line": 78,
+                                "end_col": 33,
+                                "end_line": 103,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -18117,12 +18188,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 26,
-                                                "end_line": 77,
+                                                "end_line": 100,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 77
+                                                "start_line": 100
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -18131,8 +18202,8 @@
                                     },
                                     "While expanding the reference 'ecdsa_ptr' in:"
                                 ],
-                                "start_col": 53,
-                                "start_line": 78
+                                "start_col": 5,
+                                "start_line": 103
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -18157,8 +18228,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 98,
-                                "end_line": 78,
+                                "end_col": 20,
+                                "end_line": 104,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -18172,12 +18243,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 26,
-                                                "end_line": 77,
+                                                "end_line": 100,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 77
+                                                "start_line": 100
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -18186,8 +18257,8 @@
                                     },
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
-                                "start_col": 83,
-                                "start_line": 78
+                                "start_col": 5,
+                                "start_line": 104
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -18212,8 +18283,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 19,
-                                "end_line": 79,
+                                "end_col": 20,
+                                "end_line": 105,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -18227,12 +18298,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 26,
-                                                "end_line": 77,
+                                                "end_line": 100,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 77
+                                                "start_line": 100
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -18241,8 +18312,8 @@
                                     },
                                     "While expanding the reference '__calldata_arg_class_hash' in:"
                                 ],
-                                "start_col": 3,
-                                "start_line": 79
+                                "start_col": 4,
+                                "start_line": 105
                             },
                             "While handling calldata argument 'class_hash'"
                         ],
@@ -18261,12 +18332,12 @@
                     "hints": [],
                     "inst": {
                         "end_col": 26,
-                        "end_line": 77,
+                        "end_line": 100,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 6,
-                        "start_line": 77
+                        "start_line": 100
                     }
                 },
                 "617": {
@@ -18288,12 +18359,12 @@
                                 "parent_location": [
                                     {
                                         "end_col": 26,
-                                        "end_line": 77,
+                                        "end_line": 100,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 6,
-                                        "start_line": 77
+                                        "start_line": 100
                                     },
                                     "While constructing the external wrapper for:"
                                 ],
@@ -18312,12 +18383,12 @@
                         "parent_location": [
                             {
                                 "end_col": 26,
-                                "end_line": 77,
+                                "end_line": 100,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 77
+                                "start_line": 100
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -18343,7 +18414,7 @@
                         "parent_location": [
                             {
                                 "end_col": 26,
-                                "end_line": 77,
+                                "end_line": 100,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -18357,12 +18428,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 26,
-                                                "end_line": 77,
+                                                "end_line": 100,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 77
+                                                "start_line": 100
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -18372,7 +18443,7 @@
                                     "While expanding the reference 'syscall_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 77
+                                "start_line": 100
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -18398,7 +18469,7 @@
                         "parent_location": [
                             {
                                 "end_col": 26,
-                                "end_line": 77,
+                                "end_line": 100,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -18412,12 +18483,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 26,
-                                                "end_line": 77,
+                                                "end_line": 100,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 77
+                                                "start_line": 100
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -18427,7 +18498,7 @@
                                     "While expanding the reference 'pedersen_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 77
+                                "start_line": 100
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -18453,7 +18524,7 @@
                         "parent_location": [
                             {
                                 "end_col": 26,
-                                "end_line": 77,
+                                "end_line": 100,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -18467,12 +18538,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 26,
-                                                "end_line": 77,
+                                                "end_line": 100,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 77
+                                                "start_line": 100
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -18482,7 +18553,7 @@
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 77
+                                "start_line": 100
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -18508,7 +18579,7 @@
                         "parent_location": [
                             {
                                 "end_col": 26,
-                                "end_line": 77,
+                                "end_line": 100,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -18522,12 +18593,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 26,
-                                                "end_line": 77,
+                                                "end_line": 100,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 77
+                                                "start_line": 100
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -18537,7 +18608,7 @@
                                     "While expanding the reference 'ecdsa_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 77
+                                "start_line": 100
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -18563,7 +18634,7 @@
                         "parent_location": [
                             {
                                 "end_col": 26,
-                                "end_line": 77,
+                                "end_line": 100,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -18577,12 +18648,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 26,
-                                                "end_line": 77,
+                                                "end_line": 100,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 77
+                                                "start_line": 100
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -18592,7 +18663,7 @@
                                     "While expanding the reference 'bitwise_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 77
+                                "start_line": 100
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -18618,7 +18689,7 @@
                         "parent_location": [
                             {
                                 "end_col": 26,
-                                "end_line": 77,
+                                "end_line": 100,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -18632,12 +18703,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 26,
-                                                "end_line": 77,
+                                                "end_line": 100,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 77
+                                                "start_line": 100
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -18647,7 +18718,7 @@
                                     "While expanding the reference 'retdata_size' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 77
+                                "start_line": 100
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -18673,7 +18744,7 @@
                         "parent_location": [
                             {
                                 "end_col": 26,
-                                "end_line": 77,
+                                "end_line": 100,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -18687,12 +18758,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 26,
-                                                "end_line": 77,
+                                                "end_line": 100,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 77
+                                                "start_line": 100
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -18702,7 +18773,7 @@
                                     "While expanding the reference 'retdata' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 77
+                                "start_line": 100
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -18728,12 +18799,12 @@
                         "parent_location": [
                             {
                                 "end_col": 26,
-                                "end_line": 77,
+                                "end_line": 100,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 77
+                                "start_line": 100
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -18745,118 +18816,1650 @@
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
-                        "__main__.__execute__"
+                        "__main__.__validate_deploy__"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
                         "end_col": 23,
-                        "end_line": 87,
+                        "end_line": 113,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 27,
-                                "end_line": 172,
+                                "end_col": 36,
+                                "end_line": 438,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 6,
-                                        "end_line": 97,
+                                        "end_col": 34,
+                                        "end_line": 122,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
-                                        "start_col": 36,
-                                        "start_line": 95
+                                        "start_col": 21,
+                                        "start_line": 122
                                     },
                                     "While trying to retrieve the implicit argument 'syscall_ptr' in:"
                                 ],
-                                "start_col": 9,
-                                "start_line": 172
+                                "start_col": 18,
+                                "start_line": 438
                             },
                             "While expanding the reference 'syscall_ptr' in:"
                         ],
                         "start_col": 5,
-                        "start_line": 87
+                        "start_line": 113
                     }
                 },
                 "629": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
-                        "__main__.__execute__"
+                        "__main__.__validate_deploy__"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 31,
-                        "end_line": 88,
+                        "end_col": 34,
+                        "end_line": 122,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
+                        "start_col": 21,
+                        "start_line": 122
+                    }
+                },
+                "631": {
+                    "accessible_scopes": [
+                        "__main__",
+                        "__main__",
+                        "__main__.__validate_deploy__"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 36,
+                        "end_line": 438,
+                        "input_file": {
+                            "filename": "/home/cairo-contracts/env/lib/python3.8/site-packages/starkware/starknet/common/syscalls.cairo"
+                        },
                         "parent_location": [
                             {
-                                "end_col": 35,
-                                "end_line": 173,
+                                "end_col": 34,
+                                "end_line": 122,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 6,
-                                        "end_line": 97,
+                                        "end_col": 27,
+                                        "end_line": 120,
                                         "input_file": {
-                                            "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                         },
-                                        "start_col": 36,
-                                        "start_line": 95
+                                        "parent_location": [
+                                            {
+                                                "end_col": 99,
+                                                "end_line": 123,
+                                                "input_file": {
+                                                    "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                                },
+                                                "start_col": 5,
+                                                "start_line": 123
+                                            },
+                                            "While trying to retrieve the implicit argument 'syscall_ptr' in:"
+                                        ],
+                                        "start_col": 9,
+                                        "start_line": 120
                                     },
-                                    "While trying to retrieve the implicit argument 'pedersen_ptr' in:"
+                                    "While expanding the reference 'syscall_ptr' in:"
                                 ],
-                                "start_col": 9,
-                                "start_line": 173
+                                "start_col": 21,
+                                "start_line": 122
                             },
-                            "While expanding the reference 'pedersen_ptr' in:"
+                            "While trying to update the implicit return value 'syscall_ptr' in:"
                         ],
-                        "start_col": 5,
-                        "start_line": 88
+                        "start_col": 18,
+                        "start_line": 438
                     }
                 },
-                "630": {
+                "632": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
-                        "__main__.__execute__"
+                        "__main__.__validate_deploy__"
                     ],
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 33,
-                        "end_line": 89,
+                        "end_col": 31,
+                        "end_line": 114,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "parent_location": [
                             {
-                                "end_col": 37,
-                                "end_line": 174,
+                                "end_col": 35,
+                                "end_line": 121,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
-                                        "end_col": 6,
-                                        "end_line": 97,
+                                        "end_col": 99,
+                                        "end_line": 123,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
-                                        "start_col": 36,
-                                        "start_line": 95
+                                        "start_col": 5,
+                                        "start_line": 123
                                     },
-                                    "While trying to retrieve the implicit argument 'ecdsa_ptr' in:"
+                                    "While trying to retrieve the implicit argument 'pedersen_ptr' in:"
+                                ],
+                                "start_col": 9,
+                                "start_line": 121
+                            },
+                            "While expanding the reference 'pedersen_ptr' in:"
+                        ],
+                        "start_col": 5,
+                        "start_line": 114
+                    }
+                },
+                "633": {
+                    "accessible_scopes": [
+                        "__main__",
+                        "__main__",
+                        "__main__.__validate_deploy__"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 33,
+                        "end_line": 115,
+                        "input_file": {
+                            "filename": "src/openzeppelin/account/presets/Account.cairo"
+                        },
+                        "parent_location": [
+                            {
+                                "end_col": 37,
+                                "end_line": 122,
+                                "input_file": {
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                },
+                                "parent_location": [
+                                    {
+                                        "end_col": 99,
+                                        "end_line": 123,
+                                        "input_file": {
+                                            "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                        },
+                                        "start_col": 5,
+                                        "start_line": 123
+                                    },
+                                    "While trying to retrieve the implicit argument 'ecdsa_ptr' in:"
+                                ],
+                                "start_col": 9,
+                                "start_line": 122
+                            },
+                            "While expanding the reference 'ecdsa_ptr' in:"
+                        ],
+                        "start_col": 5,
+                        "start_line": 115
+                    }
+                },
+                "634": {
+                    "accessible_scopes": [
+                        "__main__",
+                        "__main__",
+                        "__main__.__validate_deploy__"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 20,
+                        "end_line": 116,
+                        "input_file": {
+                            "filename": "src/openzeppelin/account/presets/Account.cairo"
+                        },
+                        "parent_location": [
+                            {
+                                "end_col": 24,
+                                "end_line": 123,
+                                "input_file": {
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                },
+                                "parent_location": [
+                                    {
+                                        "end_col": 99,
+                                        "end_line": 123,
+                                        "input_file": {
+                                            "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                        },
+                                        "start_col": 5,
+                                        "start_line": 123
+                                    },
+                                    "While trying to retrieve the implicit argument 'range_check_ptr' in:"
+                                ],
+                                "start_col": 9,
+                                "start_line": 123
+                            },
+                            "While expanding the reference 'range_check_ptr' in:"
+                        ],
+                        "start_col": 5,
+                        "start_line": 116
+                    }
+                },
+                "635": {
+                    "accessible_scopes": [
+                        "__main__",
+                        "__main__",
+                        "__main__.__validate_deploy__"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 56,
+                        "end_line": 123,
+                        "input_file": {
+                            "filename": "src/openzeppelin/account/presets/Account.cairo"
+                        },
+                        "start_col": 32,
+                        "start_line": 123
+                    }
+                },
+                "636": {
+                    "accessible_scopes": [
+                        "__main__",
+                        "__main__",
+                        "__main__.__validate_deploy__"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 79,
+                        "end_line": 123,
+                        "input_file": {
+                            "filename": "src/openzeppelin/account/presets/Account.cairo"
+                        },
+                        "start_col": 58,
+                        "start_line": 123
+                    }
+                },
+                "637": {
+                    "accessible_scopes": [
+                        "__main__",
+                        "__main__",
+                        "__main__.__validate_deploy__"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 98,
+                        "end_line": 123,
+                        "input_file": {
+                            "filename": "src/openzeppelin/account/presets/Account.cairo"
+                        },
+                        "start_col": 81,
+                        "start_line": 123
+                    }
+                },
+                "638": {
+                    "accessible_scopes": [
+                        "__main__",
+                        "__main__",
+                        "__main__.__validate_deploy__"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 99,
+                        "end_line": 123,
+                        "input_file": {
+                            "filename": "src/openzeppelin/account/presets/Account.cairo"
+                        },
+                        "start_col": 5,
+                        "start_line": 123
+                    }
+                },
+                "640": {
+                    "accessible_scopes": [
+                        "__main__",
+                        "__main__",
+                        "__main__.__validate_deploy__"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 27,
+                        "end_line": 120,
+                        "input_file": {
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                        },
+                        "parent_location": [
+                            {
+                                "end_col": 99,
+                                "end_line": 123,
+                                "input_file": {
+                                    "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                },
+                                "parent_location": [
+                                    {
+                                        "end_col": 23,
+                                        "end_line": 113,
+                                        "input_file": {
+                                            "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                        },
+                                        "parent_location": [
+                                            {
+                                                "end_col": 15,
+                                                "end_line": 124,
+                                                "input_file": {
+                                                    "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                                },
+                                                "start_col": 5,
+                                                "start_line": 124
+                                            },
+                                            "While trying to retrieve the implicit argument 'syscall_ptr' in:"
+                                        ],
+                                        "start_col": 5,
+                                        "start_line": 113
+                                    },
+                                    "While expanding the reference 'syscall_ptr' in:"
+                                ],
+                                "start_col": 5,
+                                "start_line": 123
+                            },
+                            "While trying to update the implicit return value 'syscall_ptr' in:"
+                        ],
+                        "start_col": 9,
+                        "start_line": 120
+                    }
+                },
+                "641": {
+                    "accessible_scopes": [
+                        "__main__",
+                        "__main__",
+                        "__main__.__validate_deploy__"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 35,
+                        "end_line": 121,
+                        "input_file": {
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                        },
+                        "parent_location": [
+                            {
+                                "end_col": 99,
+                                "end_line": 123,
+                                "input_file": {
+                                    "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                },
+                                "parent_location": [
+                                    {
+                                        "end_col": 31,
+                                        "end_line": 114,
+                                        "input_file": {
+                                            "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                        },
+                                        "parent_location": [
+                                            {
+                                                "end_col": 15,
+                                                "end_line": 124,
+                                                "input_file": {
+                                                    "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                                },
+                                                "start_col": 5,
+                                                "start_line": 124
+                                            },
+                                            "While trying to retrieve the implicit argument 'pedersen_ptr' in:"
+                                        ],
+                                        "start_col": 5,
+                                        "start_line": 114
+                                    },
+                                    "While expanding the reference 'pedersen_ptr' in:"
+                                ],
+                                "start_col": 5,
+                                "start_line": 123
+                            },
+                            "While trying to update the implicit return value 'pedersen_ptr' in:"
+                        ],
+                        "start_col": 9,
+                        "start_line": 121
+                    }
+                },
+                "642": {
+                    "accessible_scopes": [
+                        "__main__",
+                        "__main__",
+                        "__main__.__validate_deploy__"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 37,
+                        "end_line": 122,
+                        "input_file": {
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                        },
+                        "parent_location": [
+                            {
+                                "end_col": 99,
+                                "end_line": 123,
+                                "input_file": {
+                                    "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                },
+                                "parent_location": [
+                                    {
+                                        "end_col": 33,
+                                        "end_line": 115,
+                                        "input_file": {
+                                            "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                        },
+                                        "parent_location": [
+                                            {
+                                                "end_col": 15,
+                                                "end_line": 124,
+                                                "input_file": {
+                                                    "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                                },
+                                                "start_col": 5,
+                                                "start_line": 124
+                                            },
+                                            "While trying to retrieve the implicit argument 'ecdsa_ptr' in:"
+                                        ],
+                                        "start_col": 5,
+                                        "start_line": 115
+                                    },
+                                    "While expanding the reference 'ecdsa_ptr' in:"
+                                ],
+                                "start_col": 5,
+                                "start_line": 123
+                            },
+                            "While trying to update the implicit return value 'ecdsa_ptr' in:"
+                        ],
+                        "start_col": 9,
+                        "start_line": 122
+                    }
+                },
+                "643": {
+                    "accessible_scopes": [
+                        "__main__",
+                        "__main__",
+                        "__main__.__validate_deploy__"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 24,
+                        "end_line": 123,
+                        "input_file": {
+                            "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                        },
+                        "parent_location": [
+                            {
+                                "end_col": 99,
+                                "end_line": 123,
+                                "input_file": {
+                                    "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                },
+                                "parent_location": [
+                                    {
+                                        "end_col": 20,
+                                        "end_line": 116,
+                                        "input_file": {
+                                            "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                        },
+                                        "parent_location": [
+                                            {
+                                                "end_col": 15,
+                                                "end_line": 124,
+                                                "input_file": {
+                                                    "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                                },
+                                                "start_col": 5,
+                                                "start_line": 124
+                                            },
+                                            "While trying to retrieve the implicit argument 'range_check_ptr' in:"
+                                        ],
+                                        "start_col": 5,
+                                        "start_line": 116
+                                    },
+                                    "While expanding the reference 'range_check_ptr' in:"
+                                ],
+                                "start_col": 5,
+                                "start_line": 123
+                            },
+                            "While trying to update the implicit return value 'range_check_ptr' in:"
+                        ],
+                        "start_col": 9,
+                        "start_line": 123
+                    }
+                },
+                "644": {
+                    "accessible_scopes": [
+                        "__main__",
+                        "__main__",
+                        "__main__.__validate_deploy__"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 15,
+                        "end_line": 124,
+                        "input_file": {
+                            "filename": "src/openzeppelin/account/presets/Account.cairo"
+                        },
+                        "start_col": 5,
+                        "start_line": 124
+                    }
+                },
+                "645": {
+                    "accessible_scopes": [
+                        "__main__",
+                        "__main__",
+                        "__wrappers__",
+                        "__wrappers__.__validate_deploy__"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 40,
+                        "end_line": 2,
+                        "input_file": {
+                            "filename": "autogen/starknet/arg_processor/e0103dcf78458048e6a2fbe82ac74a16ee35839175ed068cc53ace2ff3c8d843.cairo"
+                        },
+                        "parent_location": [
+                            {
+                                "end_col": 20,
+                                "end_line": 120,
+                                "input_file": {
+                                    "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                },
+                                "parent_location": [
+                                    {
+                                        "end_col": 45,
+                                        "end_line": 1,
+                                        "input_file": {
+                                            "filename": "autogen/starknet/arg_processor/c31620b02d4d706f0542c989b2aadc01b0981d1f6a5933a8fe4937ace3d70d92.cairo"
+                                        },
+                                        "parent_location": [
+                                            {
+                                                "end_col": 25,
+                                                "end_line": 112,
+                                                "input_file": {
+                                                    "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                                },
+                                                "parent_location": [
+                                                    {
+                                                        "end_col": 57,
+                                                        "end_line": 1,
+                                                        "input_file": {
+                                                            "filename": "autogen/starknet/arg_processor/01cba52f8515996bb9d7070bde81ff39281d096d7024a558efcba6e1fd2402cf.cairo"
+                                                        },
+                                                        "parent_location": [
+                                                            {
+                                                                "end_col": 25,
+                                                                "end_line": 112,
+                                                                "input_file": {
+                                                                    "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                                                },
+                                                                "start_col": 6,
+                                                                "start_line": 112
+                                                            },
+                                                            "While handling calldata of"
+                                                        ],
+                                                        "start_col": 35,
+                                                        "start_line": 1
+                                                    },
+                                                    "While expanding the reference '__calldata_actual_size' in:"
+                                                ],
+                                                "start_col": 6,
+                                                "start_line": 112
+                                            },
+                                            "While handling calldata of"
+                                        ],
+                                        "start_col": 31,
+                                        "start_line": 1
+                                    },
+                                    "While expanding the reference '__calldata_ptr' in:"
+                                ],
+                                "start_col": 5,
+                                "start_line": 120
+                            },
+                            "While handling calldata argument 'publicKey'"
+                        ],
+                        "start_col": 22,
+                        "start_line": 2
+                    }
+                },
+                "647": {
+                    "accessible_scopes": [
+                        "__main__",
+                        "__main__",
+                        "__wrappers__",
+                        "__wrappers__.__validate_deploy__"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 58,
+                        "end_line": 1,
+                        "input_file": {
+                            "filename": "autogen/starknet/arg_processor/01cba52f8515996bb9d7070bde81ff39281d096d7024a558efcba6e1fd2402cf.cairo"
+                        },
+                        "parent_location": [
+                            {
+                                "end_col": 25,
+                                "end_line": 112,
+                                "input_file": {
+                                    "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                },
+                                "start_col": 6,
+                                "start_line": 112
+                            },
+                            "While handling calldata of"
+                        ],
+                        "start_col": 1,
+                        "start_line": 1
+                    }
+                },
+                "648": {
+                    "accessible_scopes": [
+                        "__main__",
+                        "__main__",
+                        "__wrappers__",
+                        "__wrappers__.__validate_deploy__"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 64,
+                        "end_line": 1,
+                        "input_file": {
+                            "filename": "autogen/starknet/external/__validate_deploy__/b2c52ca2d2a8fc8791a983086d8716c5eacd0c3d62934914d2286f84b98ff4cb.cairo"
+                        },
+                        "parent_location": [
+                            {
+                                "end_col": 23,
+                                "end_line": 113,
+                                "input_file": {
+                                    "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                },
+                                "parent_location": [
+                                    {
+                                        "end_col": 55,
+                                        "end_line": 1,
+                                        "input_file": {
+                                            "filename": "autogen/starknet/external/__validate_deploy__/848b6f2a8b49060747719a7d39d6d2fa962bc14d0633409ac194aa41364c7768.cairo"
+                                        },
+                                        "parent_location": [
+                                            {
+                                                "end_col": 25,
+                                                "end_line": 112,
+                                                "input_file": {
+                                                    "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                                },
+                                                "start_col": 6,
+                                                "start_line": 112
+                                            },
+                                            "While constructing the external wrapper for:"
+                                        ],
+                                        "start_col": 44,
+                                        "start_line": 1
+                                    },
+                                    "While expanding the reference 'syscall_ptr' in:"
+                                ],
+                                "start_col": 5,
+                                "start_line": 113
+                            },
+                            "While constructing the external wrapper for:"
+                        ],
+                        "start_col": 19,
+                        "start_line": 1
+                    }
+                },
+                "649": {
+                    "accessible_scopes": [
+                        "__main__",
+                        "__main__",
+                        "__wrappers__",
+                        "__wrappers__.__validate_deploy__"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 110,
+                        "end_line": 1,
+                        "input_file": {
+                            "filename": "autogen/starknet/external/__validate_deploy__/9684a85e93c782014ca14293edea4eb2502039a5a7b6538ecd39c56faaf12529.cairo"
+                        },
+                        "parent_location": [
+                            {
+                                "end_col": 31,
+                                "end_line": 114,
+                                "input_file": {
+                                    "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                },
+                                "parent_location": [
+                                    {
+                                        "end_col": 82,
+                                        "end_line": 1,
+                                        "input_file": {
+                                            "filename": "autogen/starknet/external/__validate_deploy__/848b6f2a8b49060747719a7d39d6d2fa962bc14d0633409ac194aa41364c7768.cairo"
+                                        },
+                                        "parent_location": [
+                                            {
+                                                "end_col": 25,
+                                                "end_line": 112,
+                                                "input_file": {
+                                                    "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                                },
+                                                "start_col": 6,
+                                                "start_line": 112
+                                            },
+                                            "While constructing the external wrapper for:"
+                                        ],
+                                        "start_col": 70,
+                                        "start_line": 1
+                                    },
+                                    "While expanding the reference 'pedersen_ptr' in:"
+                                ],
+                                "start_col": 5,
+                                "start_line": 114
+                            },
+                            "While constructing the external wrapper for:"
+                        ],
+                        "start_col": 20,
+                        "start_line": 1
+                    }
+                },
+                "650": {
+                    "accessible_scopes": [
+                        "__main__",
+                        "__main__",
+                        "__wrappers__",
+                        "__wrappers__.__validate_deploy__"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 112,
+                        "end_line": 1,
+                        "input_file": {
+                            "filename": "autogen/starknet/external/__validate_deploy__/972efe4adb0e1cedbdf0f0747cf1e121111a6180229de74773d49a6e595c4f3d.cairo"
+                        },
+                        "parent_location": [
+                            {
+                                "end_col": 33,
+                                "end_line": 115,
+                                "input_file": {
+                                    "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                },
+                                "parent_location": [
+                                    {
+                                        "end_col": 103,
+                                        "end_line": 1,
+                                        "input_file": {
+                                            "filename": "autogen/starknet/external/__validate_deploy__/848b6f2a8b49060747719a7d39d6d2fa962bc14d0633409ac194aa41364c7768.cairo"
+                                        },
+                                        "parent_location": [
+                                            {
+                                                "end_col": 25,
+                                                "end_line": 112,
+                                                "input_file": {
+                                                    "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                                },
+                                                "start_col": 6,
+                                                "start_line": 112
+                                            },
+                                            "While constructing the external wrapper for:"
+                                        ],
+                                        "start_col": 94,
+                                        "start_line": 1
+                                    },
+                                    "While expanding the reference 'ecdsa_ptr' in:"
+                                ],
+                                "start_col": 5,
+                                "start_line": 115
+                            },
+                            "While constructing the external wrapper for:"
+                        ],
+                        "start_col": 17,
+                        "start_line": 1
+                    }
+                },
+                "651": {
+                    "accessible_scopes": [
+                        "__main__",
+                        "__main__",
+                        "__wrappers__",
+                        "__wrappers__.__validate_deploy__"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 67,
+                        "end_line": 1,
+                        "input_file": {
+                            "filename": "autogen/starknet/external/__validate_deploy__/741ea357d6336b0bed7bf0472425acd0311d543883b803388880e60a232040c7.cairo"
+                        },
+                        "parent_location": [
+                            {
+                                "end_col": 20,
+                                "end_line": 116,
+                                "input_file": {
+                                    "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                },
+                                "parent_location": [
+                                    {
+                                        "end_col": 136,
+                                        "end_line": 1,
+                                        "input_file": {
+                                            "filename": "autogen/starknet/external/__validate_deploy__/848b6f2a8b49060747719a7d39d6d2fa962bc14d0633409ac194aa41364c7768.cairo"
+                                        },
+                                        "parent_location": [
+                                            {
+                                                "end_col": 25,
+                                                "end_line": 112,
+                                                "input_file": {
+                                                    "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                                },
+                                                "start_col": 6,
+                                                "start_line": 112
+                                            },
+                                            "While constructing the external wrapper for:"
+                                        ],
+                                        "start_col": 121,
+                                        "start_line": 1
+                                    },
+                                    "While expanding the reference 'range_check_ptr' in:"
+                                ],
+                                "start_col": 5,
+                                "start_line": 116
+                            },
+                            "While constructing the external wrapper for:"
+                        ],
+                        "start_col": 23,
+                        "start_line": 1
+                    }
+                },
+                "652": {
+                    "accessible_scopes": [
+                        "__main__",
+                        "__main__",
+                        "__wrappers__",
+                        "__wrappers__.__validate_deploy__"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 49,
+                        "end_line": 1,
+                        "input_file": {
+                            "filename": "autogen/starknet/arg_processor/6a5e642bec1f7526308a73478077ef051a66625a56a9015e448ad8b892166ca8.cairo"
+                        },
+                        "parent_location": [
+                            {
+                                "end_col": 21,
+                                "end_line": 118,
+                                "input_file": {
+                                    "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                },
+                                "parent_location": [
+                                    {
+                                        "end_col": 174,
+                                        "end_line": 1,
+                                        "input_file": {
+                                            "filename": "autogen/starknet/external/__validate_deploy__/848b6f2a8b49060747719a7d39d6d2fa962bc14d0633409ac194aa41364c7768.cairo"
+                                        },
+                                        "parent_location": [
+                                            {
+                                                "end_col": 25,
+                                                "end_line": 112,
+                                                "input_file": {
+                                                    "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                                },
+                                                "start_col": 6,
+                                                "start_line": 112
+                                            },
+                                            "While constructing the external wrapper for:"
+                                        ],
+                                        "start_col": 149,
+                                        "start_line": 1
+                                    },
+                                    "While expanding the reference '__calldata_arg_class_hash' in:"
+                                ],
+                                "start_col": 5,
+                                "start_line": 118
+                            },
+                            "While handling calldata argument 'class_hash'"
+                        ],
+                        "start_col": 33,
+                        "start_line": 1
+                    }
+                },
+                "653": {
+                    "accessible_scopes": [
+                        "__main__",
+                        "__main__",
+                        "__wrappers__",
+                        "__wrappers__.__validate_deploy__"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 43,
+                        "end_line": 1,
+                        "input_file": {
+                            "filename": "autogen/starknet/arg_processor/ba1d9ba0c2820d7cb2df6f2f4aeae34ef8b189c7149c4a757e99674aa5743013.cairo"
+                        },
+                        "parent_location": [
+                            {
+                                "end_col": 15,
+                                "end_line": 119,
+                                "input_file": {
+                                    "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                },
+                                "parent_location": [
+                                    {
+                                        "end_col": 200,
+                                        "end_line": 1,
+                                        "input_file": {
+                                            "filename": "autogen/starknet/external/__validate_deploy__/848b6f2a8b49060747719a7d39d6d2fa962bc14d0633409ac194aa41364c7768.cairo"
+                                        },
+                                        "parent_location": [
+                                            {
+                                                "end_col": 25,
+                                                "end_line": 112,
+                                                "input_file": {
+                                                    "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                                },
+                                                "start_col": 6,
+                                                "start_line": 112
+                                            },
+                                            "While constructing the external wrapper for:"
+                                        ],
+                                        "start_col": 181,
+                                        "start_line": 1
+                                    },
+                                    "While expanding the reference '__calldata_arg_salt' in:"
+                                ],
+                                "start_col": 5,
+                                "start_line": 119
+                            },
+                            "While handling calldata argument 'salt'"
+                        ],
+                        "start_col": 27,
+                        "start_line": 1
+                    }
+                },
+                "654": {
+                    "accessible_scopes": [
+                        "__main__",
+                        "__main__",
+                        "__wrappers__",
+                        "__wrappers__.__validate_deploy__"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 48,
+                        "end_line": 1,
+                        "input_file": {
+                            "filename": "autogen/starknet/arg_processor/e0103dcf78458048e6a2fbe82ac74a16ee35839175ed068cc53ace2ff3c8d843.cairo"
+                        },
+                        "parent_location": [
+                            {
+                                "end_col": 20,
+                                "end_line": 120,
+                                "input_file": {
+                                    "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                },
+                                "parent_location": [
+                                    {
+                                        "end_col": 236,
+                                        "end_line": 1,
+                                        "input_file": {
+                                            "filename": "autogen/starknet/external/__validate_deploy__/848b6f2a8b49060747719a7d39d6d2fa962bc14d0633409ac194aa41364c7768.cairo"
+                                        },
+                                        "parent_location": [
+                                            {
+                                                "end_col": 25,
+                                                "end_line": 112,
+                                                "input_file": {
+                                                    "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                                },
+                                                "start_col": 6,
+                                                "start_line": 112
+                                            },
+                                            "While constructing the external wrapper for:"
+                                        ],
+                                        "start_col": 212,
+                                        "start_line": 1
+                                    },
+                                    "While expanding the reference '__calldata_arg_publicKey' in:"
+                                ],
+                                "start_col": 5,
+                                "start_line": 120
+                            },
+                            "While handling calldata argument 'publicKey'"
+                        ],
+                        "start_col": 32,
+                        "start_line": 1
+                    }
+                },
+                "655": {
+                    "accessible_scopes": [
+                        "__main__",
+                        "__main__",
+                        "__wrappers__",
+                        "__wrappers__.__validate_deploy__"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 25,
+                        "end_line": 112,
+                        "input_file": {
+                            "filename": "src/openzeppelin/account/presets/Account.cairo"
+                        },
+                        "start_col": 6,
+                        "start_line": 112
+                    }
+                },
+                "657": {
+                    "accessible_scopes": [
+                        "__main__",
+                        "__main__",
+                        "__wrappers__",
+                        "__wrappers__.__validate_deploy__"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [
+                        {
+                            "location": {
+                                "end_col": 34,
+                                "end_line": 2,
+                                "input_file": {
+                                    "filename": "autogen/starknet/external/__validate_deploy__/848b6f2a8b49060747719a7d39d6d2fa962bc14d0633409ac194aa41364c7768.cairo"
+                                },
+                                "parent_location": [
+                                    {
+                                        "end_col": 25,
+                                        "end_line": 112,
+                                        "input_file": {
+                                            "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                        },
+                                        "start_col": 6,
+                                        "start_line": 112
+                                    },
+                                    "While constructing the external wrapper for:"
+                                ],
+                                "start_col": 1,
+                                "start_line": 2
+                            },
+                            "n_prefix_newlines": 0
+                        }
+                    ],
+                    "inst": {
+                        "end_col": 24,
+                        "end_line": 3,
+                        "input_file": {
+                            "filename": "autogen/starknet/external/__validate_deploy__/848b6f2a8b49060747719a7d39d6d2fa962bc14d0633409ac194aa41364c7768.cairo"
+                        },
+                        "parent_location": [
+                            {
+                                "end_col": 25,
+                                "end_line": 112,
+                                "input_file": {
+                                    "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                },
+                                "start_col": 6,
+                                "start_line": 112
+                            },
+                            "While constructing the external wrapper for:"
+                        ],
+                        "start_col": 1,
+                        "start_line": 3
+                    }
+                },
+                "659": {
+                    "accessible_scopes": [
+                        "__main__",
+                        "__main__",
+                        "__wrappers__",
+                        "__wrappers__.__validate_deploy__"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 55,
+                        "end_line": 1,
+                        "input_file": {
+                            "filename": "autogen/starknet/external/__validate_deploy__/848b6f2a8b49060747719a7d39d6d2fa962bc14d0633409ac194aa41364c7768.cairo"
+                        },
+                        "parent_location": [
+                            {
+                                "end_col": 25,
+                                "end_line": 112,
+                                "input_file": {
+                                    "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                },
+                                "parent_location": [
+                                    {
+                                        "end_col": 20,
+                                        "end_line": 1,
+                                        "input_file": {
+                                            "filename": "autogen/starknet/external/__validate_deploy__/b363de5c884e054e373732fa94161084d4128000eba968c31dbb40d4ab78ae25.cairo"
+                                        },
+                                        "parent_location": [
+                                            {
+                                                "end_col": 25,
+                                                "end_line": 112,
+                                                "input_file": {
+                                                    "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                                },
+                                                "start_col": 6,
+                                                "start_line": 112
+                                            },
+                                            "While constructing the external wrapper for:"
+                                        ],
+                                        "start_col": 9,
+                                        "start_line": 1
+                                    },
+                                    "While expanding the reference 'syscall_ptr' in:"
+                                ],
+                                "start_col": 6,
+                                "start_line": 112
+                            },
+                            "While constructing the external wrapper for:"
+                        ],
+                        "start_col": 44,
+                        "start_line": 1
+                    }
+                },
+                "660": {
+                    "accessible_scopes": [
+                        "__main__",
+                        "__main__",
+                        "__wrappers__",
+                        "__wrappers__.__validate_deploy__"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 82,
+                        "end_line": 1,
+                        "input_file": {
+                            "filename": "autogen/starknet/external/__validate_deploy__/848b6f2a8b49060747719a7d39d6d2fa962bc14d0633409ac194aa41364c7768.cairo"
+                        },
+                        "parent_location": [
+                            {
+                                "end_col": 25,
+                                "end_line": 112,
+                                "input_file": {
+                                    "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                },
+                                "parent_location": [
+                                    {
+                                        "end_col": 33,
+                                        "end_line": 1,
+                                        "input_file": {
+                                            "filename": "autogen/starknet/external/__validate_deploy__/b363de5c884e054e373732fa94161084d4128000eba968c31dbb40d4ab78ae25.cairo"
+                                        },
+                                        "parent_location": [
+                                            {
+                                                "end_col": 25,
+                                                "end_line": 112,
+                                                "input_file": {
+                                                    "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                                },
+                                                "start_col": 6,
+                                                "start_line": 112
+                                            },
+                                            "While constructing the external wrapper for:"
+                                        ],
+                                        "start_col": 21,
+                                        "start_line": 1
+                                    },
+                                    "While expanding the reference 'pedersen_ptr' in:"
+                                ],
+                                "start_col": 6,
+                                "start_line": 112
+                            },
+                            "While constructing the external wrapper for:"
+                        ],
+                        "start_col": 70,
+                        "start_line": 1
+                    }
+                },
+                "661": {
+                    "accessible_scopes": [
+                        "__main__",
+                        "__main__",
+                        "__wrappers__",
+                        "__wrappers__.__validate_deploy__"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 136,
+                        "end_line": 1,
+                        "input_file": {
+                            "filename": "autogen/starknet/external/__validate_deploy__/848b6f2a8b49060747719a7d39d6d2fa962bc14d0633409ac194aa41364c7768.cairo"
+                        },
+                        "parent_location": [
+                            {
+                                "end_col": 25,
+                                "end_line": 112,
+                                "input_file": {
+                                    "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                },
+                                "parent_location": [
+                                    {
+                                        "end_col": 49,
+                                        "end_line": 1,
+                                        "input_file": {
+                                            "filename": "autogen/starknet/external/__validate_deploy__/b363de5c884e054e373732fa94161084d4128000eba968c31dbb40d4ab78ae25.cairo"
+                                        },
+                                        "parent_location": [
+                                            {
+                                                "end_col": 25,
+                                                "end_line": 112,
+                                                "input_file": {
+                                                    "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                                },
+                                                "start_col": 6,
+                                                "start_line": 112
+                                            },
+                                            "While constructing the external wrapper for:"
+                                        ],
+                                        "start_col": 34,
+                                        "start_line": 1
+                                    },
+                                    "While expanding the reference 'range_check_ptr' in:"
+                                ],
+                                "start_col": 6,
+                                "start_line": 112
+                            },
+                            "While constructing the external wrapper for:"
+                        ],
+                        "start_col": 121,
+                        "start_line": 1
+                    }
+                },
+                "662": {
+                    "accessible_scopes": [
+                        "__main__",
+                        "__main__",
+                        "__wrappers__",
+                        "__wrappers__.__validate_deploy__"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 103,
+                        "end_line": 1,
+                        "input_file": {
+                            "filename": "autogen/starknet/external/__validate_deploy__/848b6f2a8b49060747719a7d39d6d2fa962bc14d0633409ac194aa41364c7768.cairo"
+                        },
+                        "parent_location": [
+                            {
+                                "end_col": 25,
+                                "end_line": 112,
+                                "input_file": {
+                                    "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                },
+                                "parent_location": [
+                                    {
+                                        "end_col": 59,
+                                        "end_line": 1,
+                                        "input_file": {
+                                            "filename": "autogen/starknet/external/__validate_deploy__/b363de5c884e054e373732fa94161084d4128000eba968c31dbb40d4ab78ae25.cairo"
+                                        },
+                                        "parent_location": [
+                                            {
+                                                "end_col": 25,
+                                                "end_line": 112,
+                                                "input_file": {
+                                                    "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                                },
+                                                "start_col": 6,
+                                                "start_line": 112
+                                            },
+                                            "While constructing the external wrapper for:"
+                                        ],
+                                        "start_col": 50,
+                                        "start_line": 1
+                                    },
+                                    "While expanding the reference 'ecdsa_ptr' in:"
+                                ],
+                                "start_col": 6,
+                                "start_line": 112
+                            },
+                            "While constructing the external wrapper for:"
+                        ],
+                        "start_col": 94,
+                        "start_line": 1
+                    }
+                },
+                "663": {
+                    "accessible_scopes": [
+                        "__main__",
+                        "__main__",
+                        "__wrappers__",
+                        "__wrappers__.__validate_deploy__"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 63,
+                        "end_line": 1,
+                        "input_file": {
+                            "filename": "autogen/starknet/external/__validate_deploy__/2e2c5536af4c3ea88b562852f6f3740af166f645e0f066972184481010fe04da.cairo"
+                        },
+                        "parent_location": [
+                            {
+                                "end_col": 25,
+                                "end_line": 112,
+                                "input_file": {
+                                    "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                },
+                                "parent_location": [
+                                    {
+                                        "end_col": 71,
+                                        "end_line": 1,
+                                        "input_file": {
+                                            "filename": "autogen/starknet/external/__validate_deploy__/b363de5c884e054e373732fa94161084d4128000eba968c31dbb40d4ab78ae25.cairo"
+                                        },
+                                        "parent_location": [
+                                            {
+                                                "end_col": 25,
+                                                "end_line": 112,
+                                                "input_file": {
+                                                    "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                                },
+                                                "start_col": 6,
+                                                "start_line": 112
+                                            },
+                                            "While constructing the external wrapper for:"
+                                        ],
+                                        "start_col": 60,
+                                        "start_line": 1
+                                    },
+                                    "While expanding the reference 'bitwise_ptr' in:"
+                                ],
+                                "start_col": 6,
+                                "start_line": 112
+                            },
+                            "While constructing the external wrapper for:"
+                        ],
+                        "start_col": 19,
+                        "start_line": 1
+                    }
+                },
+                "664": {
+                    "accessible_scopes": [
+                        "__main__",
+                        "__main__",
+                        "__wrappers__",
+                        "__wrappers__.__validate_deploy__"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 21,
+                        "end_line": 4,
+                        "input_file": {
+                            "filename": "autogen/starknet/external/__validate_deploy__/848b6f2a8b49060747719a7d39d6d2fa962bc14d0633409ac194aa41364c7768.cairo"
+                        },
+                        "parent_location": [
+                            {
+                                "end_col": 25,
+                                "end_line": 112,
+                                "input_file": {
+                                    "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                },
+                                "parent_location": [
+                                    {
+                                        "end_col": 84,
+                                        "end_line": 1,
+                                        "input_file": {
+                                            "filename": "autogen/starknet/external/__validate_deploy__/b363de5c884e054e373732fa94161084d4128000eba968c31dbb40d4ab78ae25.cairo"
+                                        },
+                                        "parent_location": [
+                                            {
+                                                "end_col": 25,
+                                                "end_line": 112,
+                                                "input_file": {
+                                                    "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                                },
+                                                "start_col": 6,
+                                                "start_line": 112
+                                            },
+                                            "While constructing the external wrapper for:"
+                                        ],
+                                        "start_col": 72,
+                                        "start_line": 1
+                                    },
+                                    "While expanding the reference 'retdata_size' in:"
+                                ],
+                                "start_col": 6,
+                                "start_line": 112
+                            },
+                            "While constructing the external wrapper for:"
+                        ],
+                        "start_col": 20,
+                        "start_line": 4
+                    }
+                },
+                "666": {
+                    "accessible_scopes": [
+                        "__main__",
+                        "__main__",
+                        "__wrappers__",
+                        "__wrappers__.__validate_deploy__"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 16,
+                        "end_line": 3,
+                        "input_file": {
+                            "filename": "autogen/starknet/external/__validate_deploy__/848b6f2a8b49060747719a7d39d6d2fa962bc14d0633409ac194aa41364c7768.cairo"
+                        },
+                        "parent_location": [
+                            {
+                                "end_col": 25,
+                                "end_line": 112,
+                                "input_file": {
+                                    "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                },
+                                "parent_location": [
+                                    {
+                                        "end_col": 92,
+                                        "end_line": 1,
+                                        "input_file": {
+                                            "filename": "autogen/starknet/external/__validate_deploy__/b363de5c884e054e373732fa94161084d4128000eba968c31dbb40d4ab78ae25.cairo"
+                                        },
+                                        "parent_location": [
+                                            {
+                                                "end_col": 25,
+                                                "end_line": 112,
+                                                "input_file": {
+                                                    "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                                },
+                                                "start_col": 6,
+                                                "start_line": 112
+                                            },
+                                            "While constructing the external wrapper for:"
+                                        ],
+                                        "start_col": 85,
+                                        "start_line": 1
+                                    },
+                                    "While expanding the reference 'retdata' in:"
+                                ],
+                                "start_col": 6,
+                                "start_line": 112
+                            },
+                            "While constructing the external wrapper for:"
+                        ],
+                        "start_col": 9,
+                        "start_line": 3
+                    }
+                },
+                "667": {
+                    "accessible_scopes": [
+                        "__main__",
+                        "__main__",
+                        "__wrappers__",
+                        "__wrappers__.__validate_deploy__"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 94,
+                        "end_line": 1,
+                        "input_file": {
+                            "filename": "autogen/starknet/external/__validate_deploy__/b363de5c884e054e373732fa94161084d4128000eba968c31dbb40d4ab78ae25.cairo"
+                        },
+                        "parent_location": [
+                            {
+                                "end_col": 25,
+                                "end_line": 112,
+                                "input_file": {
+                                    "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                },
+                                "start_col": 6,
+                                "start_line": 112
+                            },
+                            "While constructing the external wrapper for:"
+                        ],
+                        "start_col": 1,
+                        "start_line": 1
+                    }
+                },
+                "668": {
+                    "accessible_scopes": [
+                        "__main__",
+                        "__main__",
+                        "__main__.__execute__"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 23,
+                        "end_line": 129,
+                        "input_file": {
+                            "filename": "src/openzeppelin/account/presets/Account.cairo"
+                        },
+                        "parent_location": [
+                            {
+                                "end_col": 27,
+                                "end_line": 172,
+                                "input_file": {
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                },
+                                "parent_location": [
+                                    {
+                                        "end_col": 6,
+                                        "end_line": 145,
+                                        "input_file": {
+                                            "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                        },
+                                        "start_col": 36,
+                                        "start_line": 143
+                                    },
+                                    "While trying to retrieve the implicit argument 'syscall_ptr' in:"
+                                ],
+                                "start_col": 9,
+                                "start_line": 172
+                            },
+                            "While expanding the reference 'syscall_ptr' in:"
+                        ],
+                        "start_col": 5,
+                        "start_line": 129
+                    }
+                },
+                "669": {
+                    "accessible_scopes": [
+                        "__main__",
+                        "__main__",
+                        "__main__.__execute__"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 31,
+                        "end_line": 130,
+                        "input_file": {
+                            "filename": "src/openzeppelin/account/presets/Account.cairo"
+                        },
+                        "parent_location": [
+                            {
+                                "end_col": 35,
+                                "end_line": 173,
+                                "input_file": {
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                },
+                                "parent_location": [
+                                    {
+                                        "end_col": 6,
+                                        "end_line": 145,
+                                        "input_file": {
+                                            "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                        },
+                                        "start_col": 36,
+                                        "start_line": 143
+                                    },
+                                    "While trying to retrieve the implicit argument 'pedersen_ptr' in:"
+                                ],
+                                "start_col": 9,
+                                "start_line": 173
+                            },
+                            "While expanding the reference 'pedersen_ptr' in:"
+                        ],
+                        "start_col": 5,
+                        "start_line": 130
+                    }
+                },
+                "670": {
+                    "accessible_scopes": [
+                        "__main__",
+                        "__main__",
+                        "__main__.__execute__"
+                    ],
+                    "flow_tracking_data": null,
+                    "hints": [],
+                    "inst": {
+                        "end_col": 33,
+                        "end_line": 131,
+                        "input_file": {
+                            "filename": "src/openzeppelin/account/presets/Account.cairo"
+                        },
+                        "parent_location": [
+                            {
+                                "end_col": 37,
+                                "end_line": 174,
+                                "input_file": {
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                },
+                                "parent_location": [
+                                    {
+                                        "end_col": 6,
+                                        "end_line": 145,
+                                        "input_file": {
+                                            "filename": "src/openzeppelin/account/presets/Account.cairo"
+                                        },
+                                        "start_col": 36,
+                                        "start_line": 143
+                                    },
+                                    "While trying to retrieve the implicit argument 'ecdsa_ptr' in:"
                                 ],
                                 "start_col": 9,
                                 "start_line": 174
@@ -18864,10 +20467,10 @@
                             "While expanding the reference 'ecdsa_ptr' in:"
                         ],
                         "start_col": 5,
-                        "start_line": 89
+                        "start_line": 131
                     }
                 },
-                "631": {
+                "671": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -18877,7 +20480,7 @@
                     "hints": [],
                     "inst": {
                         "end_col": 33,
-                        "end_line": 90,
+                        "end_line": 132,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
@@ -18886,17 +20489,17 @@
                                 "end_col": 37,
                                 "end_line": 175,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 6,
-                                        "end_line": 97,
+                                        "end_line": 145,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 36,
-                                        "start_line": 95
+                                        "start_line": 143
                                     },
                                     "While trying to retrieve the implicit argument 'bitwise_ptr' in:"
                                 ],
@@ -18906,10 +20509,10 @@
                             "While expanding the reference 'bitwise_ptr' in:"
                         ],
                         "start_col": 5,
-                        "start_line": 90
+                        "start_line": 132
                     }
                 },
-                "632": {
+                "672": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -18919,7 +20522,7 @@
                     "hints": [],
                     "inst": {
                         "end_col": 20,
-                        "end_line": 91,
+                        "end_line": 133,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
@@ -18928,17 +20531,17 @@
                                 "end_col": 24,
                                 "end_line": 176,
                                 "input_file": {
-                                    "filename": "/Users/ericnordelo/Documents/OpenSource/OpenZeppelin/cairo-contracts/src/openzeppelin/account/library.cairo"
+                                    "filename": "/home/cairo-contracts/src/openzeppelin/account/library.cairo"
                                 },
                                 "parent_location": [
                                     {
                                         "end_col": 6,
-                                        "end_line": 97,
+                                        "end_line": 145,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 36,
-                                        "start_line": 95
+                                        "start_line": 143
                                     },
                                     "While trying to retrieve the implicit argument 'range_check_ptr' in:"
                                 ],
@@ -18948,10 +20551,10 @@
                             "While expanding the reference 'range_check_ptr' in:"
                         ],
                         "start_col": 5,
-                        "start_line": 91
+                        "start_line": 133
                     }
                 },
-                "633": {
+                "673": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -18960,28 +20563,28 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 23,
-                        "end_line": 92,
+                        "end_col": 25,
+                        "end_line": 135,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 96,
+                                "end_line": 144,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 9,
-                                "start_line": 96
+                                "start_line": 144
                             },
                             "While expanding the reference 'call_array_len' in:"
                         ],
-                        "start_col": 3,
-                        "start_line": 92
+                        "start_col": 5,
+                        "start_line": 135
                     }
                 },
-                "634": {
+                "674": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -18990,28 +20593,28 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 54,
-                        "end_line": 92,
+                        "end_col": 34,
+                        "end_line": 136,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 35,
-                                "end_line": 96,
+                                "end_line": 144,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 25,
-                                "start_line": 96
+                                "start_line": 144
                             },
                             "While expanding the reference 'call_array' in:"
                         ],
-                        "start_col": 25,
-                        "start_line": 92
+                        "start_col": 5,
+                        "start_line": 136
                     }
                 },
-                "635": {
+                "675": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -19020,28 +20623,28 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 74,
-                        "end_line": 92,
+                        "end_col": 23,
+                        "end_line": 137,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 49,
-                                "end_line": 96,
+                                "end_line": 144,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 37,
-                                "start_line": 96
+                                "start_line": 144
                             },
                             "While expanding the reference 'calldata_len' in:"
                         ],
-                        "start_col": 56,
-                        "start_line": 92
+                        "start_col": 5,
+                        "start_line": 137
                     }
                 },
-                "636": {
+                "676": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -19050,28 +20653,28 @@
                     "flow_tracking_data": null,
                     "hints": [],
                     "inst": {
-                        "end_col": 91,
-                        "end_line": 92,
+                        "end_col": 20,
+                        "end_line": 138,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "parent_location": [
                             {
                                 "end_col": 59,
-                                "end_line": 96,
+                                "end_line": 144,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 51,
-                                "start_line": 96
+                                "start_line": 144
                             },
                             "While expanding the reference 'calldata' in:"
                         ],
-                        "start_col": 76,
-                        "start_line": 92
+                        "start_col": 5,
+                        "start_line": 138
                     }
                 },
-                "637": {
+                "677": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -19081,15 +20684,15 @@
                     "hints": [],
                     "inst": {
                         "end_col": 6,
-                        "end_line": 97,
+                        "end_line": 145,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 36,
-                        "start_line": 95
+                        "start_line": 143
                     }
                 },
-                "639": {
+                "679": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -19099,15 +20702,15 @@
                     "hints": [],
                     "inst": {
                         "end_col": 37,
-                        "end_line": 98,
+                        "end_line": 146,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 5,
-                        "start_line": 98
+                        "start_line": 146
                     }
                 },
-                "640": {
+                "680": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -19126,12 +20729,12 @@
                                 "parent_location": [
                                     {
                                         "end_col": 17,
-                                        "end_line": 86,
+                                        "end_line": 128,
                                         "input_file": {
                                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                                         },
                                         "start_col": 6,
-                                        "start_line": 86
+                                        "start_line": 128
                                     },
                                     "While handling return value of"
                                 ],
@@ -19150,12 +20753,12 @@
                         "parent_location": [
                             {
                                 "end_col": 17,
-                                "end_line": 86,
+                                "end_line": 128,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 86
+                                "start_line": 128
                             },
                             "While handling return value of"
                         ],
@@ -19163,7 +20766,7 @@
                         "start_line": 4
                     }
                 },
-                "642": {
+                "682": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -19181,12 +20784,12 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 93,
+                                "end_line": 140,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 5,
-                                "start_line": 93
+                                "start_line": 140
                             },
                             "While handling return value 'response_len'"
                         ],
@@ -19194,7 +20797,7 @@
                         "start_line": 1
                     }
                 },
-                "643": {
+                "683": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -19211,13 +20814,13 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 40,
-                                "end_line": 93,
+                                "end_col": 20,
+                                "end_line": 141,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
-                                "start_col": 25,
-                                "start_line": 93
+                                "start_col": 5,
+                                "start_line": 141
                             },
                             "While handling return value 'response'"
                         ],
@@ -19225,7 +20828,7 @@
                         "start_line": 2
                     }
                 },
-                "644": {
+                "684": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -19242,13 +20845,13 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 40,
-                                "end_line": 93,
+                                "end_col": 20,
+                                "end_line": 141,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
-                                "start_col": 25,
-                                "start_line": 93
+                                "start_col": 5,
+                                "start_line": 141
                             },
                             "While handling return value 'response'"
                         ],
@@ -19256,7 +20859,7 @@
                         "start_line": 5
                     }
                 },
-                "646": {
+                "686": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -19274,7 +20877,7 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 93,
+                                "end_line": 140,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -19287,13 +20890,13 @@
                                         },
                                         "parent_location": [
                                             {
-                                                "end_col": 40,
-                                                "end_line": 93,
+                                                "end_col": 20,
+                                                "end_line": 141,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
-                                                "start_col": 25,
-                                                "start_line": 93
+                                                "start_col": 5,
+                                                "start_line": 141
                                             },
                                             "While handling return value 'response'"
                                         ],
@@ -19303,7 +20906,7 @@
                                     "While expanding the reference '__return_value_ptr' in:"
                                 ],
                                 "start_col": 5,
-                                "start_line": 93
+                                "start_line": 140
                             },
                             "While handling return value 'response_len'"
                         ],
@@ -19311,7 +20914,7 @@
                         "start_line": 2
                     }
                 },
-                "648": {
+                "688": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -19328,13 +20931,13 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 40,
-                                "end_line": 93,
+                                "end_col": 20,
+                                "end_line": 141,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
-                                "start_col": 25,
-                                "start_line": 93
+                                "start_col": 5,
+                                "start_line": 141
                             },
                             "While handling return value 'response'"
                         ],
@@ -19342,7 +20945,7 @@
                         "start_line": 10
                     }
                 },
-                "649": {
+                "689": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -19360,7 +20963,7 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 93,
+                                "end_line": 140,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -19373,8 +20976,8 @@
                                         },
                                         "parent_location": [
                                             {
-                                                "end_col": 40,
-                                                "end_line": 93,
+                                                "end_col": 20,
+                                                "end_line": 141,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
@@ -19387,13 +20990,13 @@
                                                         },
                                                         "parent_location": [
                                                             {
-                                                                "end_col": 40,
-                                                                "end_line": 93,
+                                                                "end_col": 20,
+                                                                "end_line": 141,
                                                                 "input_file": {
                                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                                 },
-                                                                "start_col": 25,
-                                                                "start_line": 93
+                                                                "start_col": 5,
+                                                                "start_line": 141
                                                             },
                                                             "While handling return value 'response'"
                                                         ],
@@ -19402,8 +21005,8 @@
                                                     },
                                                     "While expanding the reference '__return_value_ptr_copy' in:"
                                                 ],
-                                                "start_col": 25,
-                                                "start_line": 93
+                                                "start_col": 5,
+                                                "start_line": 141
                                             },
                                             "While handling return value 'response'"
                                         ],
@@ -19413,7 +21016,7 @@
                                     "While expanding the reference '__return_value_ptr' in:"
                                 ],
                                 "start_col": 5,
-                                "start_line": 93
+                                "start_line": 140
                             },
                             "While handling return value 'response_len'"
                         ],
@@ -19421,7 +21024,7 @@
                         "start_line": 2
                     }
                 },
-                "651": {
+                "691": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -19438,13 +21041,13 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 40,
-                                "end_line": 93,
+                                "end_col": 20,
+                                "end_line": 141,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
-                                "start_col": 25,
-                                "start_line": 93
+                                "start_col": 5,
+                                "start_line": 141
                             },
                             "While handling return value 'response'"
                         ],
@@ -19452,7 +21055,7 @@
                         "start_line": 13
                     }
                 },
-                "652": {
+                "692": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -19469,13 +21072,13 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 40,
-                                "end_line": 93,
+                                "end_col": 20,
+                                "end_line": 141,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
-                                "start_col": 25,
-                                "start_line": 93
+                                "start_col": 5,
+                                "start_line": 141
                             },
                             "While handling return value 'response'"
                         ],
@@ -19483,7 +21086,7 @@
                         "start_line": 14
                     }
                 },
-                "653": {
+                "693": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -19500,13 +21103,13 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 40,
-                                "end_line": 93,
+                                "end_col": 20,
+                                "end_line": 141,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
-                                "start_col": 25,
-                                "start_line": 93
+                                "start_col": 5,
+                                "start_line": 141
                             },
                             "While handling return value 'response'"
                         ],
@@ -19514,7 +21117,7 @@
                         "start_line": 11
                     }
                 },
-                "655": {
+                "695": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -19531,8 +21134,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 40,
-                                "end_line": 93,
+                                "end_col": 20,
+                                "end_line": 141,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -19546,12 +21149,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 86,
+                                                "end_line": 128,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 86
+                                                "start_line": 128
                                             },
                                             "While handling return value of"
                                         ],
@@ -19560,8 +21163,8 @@
                                     },
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
-                                "start_col": 25,
-                                "start_line": 93
+                                "start_col": 5,
+                                "start_line": 141
                             },
                             "While handling return value 'response'"
                         ],
@@ -19569,7 +21172,7 @@
                         "start_line": 5
                     }
                 },
-                "656": {
+                "696": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -19587,12 +21190,12 @@
                         "parent_location": [
                             {
                                 "end_col": 17,
-                                "end_line": 86,
+                                "end_line": 128,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 86
+                                "start_line": 128
                             },
                             "While handling return value of"
                         ],
@@ -19600,7 +21203,7 @@
                         "start_line": 11
                     }
                 },
-                "657": {
+                "697": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -19618,7 +21221,7 @@
                         "parent_location": [
                             {
                                 "end_col": 17,
-                                "end_line": 86,
+                                "end_line": 128,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -19632,12 +21235,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 86,
+                                                "end_line": 128,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 86
+                                                "start_line": 128
                                             },
                                             "While handling return value of"
                                         ],
@@ -19647,7 +21250,7 @@
                                     "While expanding the reference '__return_value_ptr_start' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 86
+                                "start_line": 128
                             },
                             "While handling return value of"
                         ],
@@ -19655,7 +21258,7 @@
                         "start_line": 5
                     }
                 },
-                "658": {
+                "698": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -19673,12 +21276,12 @@
                         "parent_location": [
                             {
                                 "end_col": 17,
-                                "end_line": 86,
+                                "end_line": 128,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 86
+                                "start_line": 128
                             },
                             "While handling return value of"
                         ],
@@ -19686,7 +21289,7 @@
                         "start_line": 9
                     }
                 },
-                "659": {
+                "699": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -19704,12 +21307,12 @@
                         "parent_location": [
                             {
                                 "end_col": 17,
-                                "end_line": 86,
+                                "end_line": 128,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 86
+                                "start_line": 128
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -19717,7 +21320,7 @@
                         "start_line": 2
                     }
                 },
-                "661": {
+                "701": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -19735,7 +21338,7 @@
                         "parent_location": [
                             {
                                 "end_col": 20,
-                                "end_line": 91,
+                                "end_line": 133,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -19748,13 +21351,13 @@
                                         },
                                         "parent_location": [
                                             {
-                                                "end_col": 54,
-                                                "end_line": 92,
+                                                "end_col": 34,
+                                                "end_line": 136,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
-                                                "start_col": 25,
-                                                "start_line": 92
+                                                "start_col": 5,
+                                                "start_line": 136
                                             },
                                             "While handling calldata argument 'call_array'"
                                         ],
@@ -19764,7 +21367,7 @@
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
                                 "start_col": 5,
-                                "start_line": 91
+                                "start_line": 133
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -19772,7 +21375,7 @@
                         "start_line": 1
                     }
                 },
-                "662": {
+                "702": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -19789,8 +21392,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 23,
-                                "end_line": 92,
+                                "end_col": 25,
+                                "end_line": 135,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -19803,13 +21406,13 @@
                                         },
                                         "parent_location": [
                                             {
-                                                "end_col": 54,
-                                                "end_line": 92,
+                                                "end_col": 34,
+                                                "end_line": 136,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
-                                                "start_col": 25,
-                                                "start_line": 92
+                                                "start_col": 5,
+                                                "start_line": 136
                                             },
                                             "While handling calldata argument 'call_array'"
                                         ],
@@ -19818,8 +21421,8 @@
                                     },
                                     "While expanding the reference '__calldata_arg_call_array_len' in:"
                                 ],
-                                "start_col": 3,
-                                "start_line": 92
+                                "start_col": 5,
+                                "start_line": 135
                             },
                             "While handling calldata argument 'call_array_len'"
                         ],
@@ -19827,7 +21430,7 @@
                         "start_line": 1
                     }
                 },
-                "663": {
+                "703": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -19844,13 +21447,13 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 54,
-                                "end_line": 92,
+                                "end_col": 34,
+                                "end_line": 136,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
-                                "start_col": 25,
-                                "start_line": 92
+                                "start_col": 5,
+                                "start_line": 136
                             },
                             "While handling calldata argument 'call_array'"
                         ],
@@ -19858,7 +21461,7 @@
                         "start_line": 2
                     }
                 },
-                "664": {
+                "704": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -19875,8 +21478,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 23,
-                                "end_line": 92,
+                                "end_col": 25,
+                                "end_line": 135,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -19889,13 +21492,13 @@
                                         },
                                         "parent_location": [
                                             {
-                                                "end_col": 54,
-                                                "end_line": 92,
+                                                "end_col": 34,
+                                                "end_line": 136,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
-                                                "start_col": 25,
-                                                "start_line": 92
+                                                "start_col": 5,
+                                                "start_line": 136
                                             },
                                             "While handling calldata argument 'call_array'"
                                         ],
@@ -19904,8 +21507,8 @@
                                     },
                                     "While expanding the reference '__calldata_ptr' in:"
                                 ],
-                                "start_col": 3,
-                                "start_line": 92
+                                "start_col": 5,
+                                "start_line": 135
                             },
                             "While handling calldata argument 'call_array_len'"
                         ],
@@ -19913,7 +21516,7 @@
                         "start_line": 2
                     }
                 },
-                "666": {
+                "706": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -19930,8 +21533,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 23,
-                                "end_line": 92,
+                                "end_col": 25,
+                                "end_line": 135,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -19944,13 +21547,13 @@
                                         },
                                         "parent_location": [
                                             {
-                                                "end_col": 54,
-                                                "end_line": 92,
+                                                "end_col": 34,
+                                                "end_line": 136,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
-                                                "start_col": 25,
-                                                "start_line": 92
+                                                "start_col": 5,
+                                                "start_line": 136
                                             },
                                             "While handling calldata argument 'call_array'"
                                         ],
@@ -19959,8 +21562,8 @@
                                     },
                                     "While expanding the reference '__calldata_arg_call_array_len' in:"
                                 ],
-                                "start_col": 3,
-                                "start_line": 92
+                                "start_col": 5,
+                                "start_line": 135
                             },
                             "While handling calldata argument 'call_array_len'"
                         ],
@@ -19968,7 +21571,7 @@
                         "start_line": 1
                     }
                 },
-                "667": {
+                "707": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -19985,13 +21588,13 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 54,
-                                "end_line": 92,
+                                "end_col": 34,
+                                "end_line": 136,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
-                                "start_col": 25,
-                                "start_line": 92
+                                "start_col": 5,
+                                "start_line": 136
                             },
                             "While handling calldata argument 'call_array'"
                         ],
@@ -19999,7 +21602,7 @@
                         "start_line": 8
                     }
                 },
-                "669": {
+                "709": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -20016,13 +21619,13 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 54,
-                                "end_line": 92,
+                                "end_col": 34,
+                                "end_line": 136,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
-                                "start_col": 25,
-                                "start_line": 92
+                                "start_col": 5,
+                                "start_line": 136
                             },
                             "While handling calldata argument 'call_array'"
                         ],
@@ -20030,7 +21633,7 @@
                         "start_line": 8
                     }
                 },
-                "670": {
+                "710": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -20048,7 +21651,7 @@
                         "parent_location": [
                             {
                                 "end_col": 20,
-                                "end_line": 91,
+                                "end_line": 133,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -20061,8 +21664,8 @@
                                         },
                                         "parent_location": [
                                             {
-                                                "end_col": 54,
-                                                "end_line": 92,
+                                                "end_col": 34,
+                                                "end_line": 136,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
@@ -20075,13 +21678,13 @@
                                                         },
                                                         "parent_location": [
                                                             {
-                                                                "end_col": 91,
-                                                                "end_line": 92,
+                                                                "end_col": 20,
+                                                                "end_line": 138,
                                                                 "input_file": {
                                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                                 },
-                                                                "start_col": 76,
-                                                                "start_line": 92
+                                                                "start_col": 5,
+                                                                "start_line": 138
                                                             },
                                                             "While handling calldata argument 'calldata'"
                                                         ],
@@ -20090,8 +21693,8 @@
                                                     },
                                                     "While expanding the reference 'range_check_ptr' in:"
                                                 ],
-                                                "start_col": 25,
-                                                "start_line": 92
+                                                "start_col": 5,
+                                                "start_line": 136
                                             },
                                             "While handling calldata argument 'call_array'"
                                         ],
@@ -20101,7 +21704,7 @@
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
                                 "start_col": 5,
-                                "start_line": 91
+                                "start_line": 133
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -20109,7 +21712,7 @@
                         "start_line": 1
                     }
                 },
-                "671": {
+                "711": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -20126,8 +21729,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 74,
-                                "end_line": 92,
+                                "end_col": 23,
+                                "end_line": 137,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -20140,13 +21743,13 @@
                                         },
                                         "parent_location": [
                                             {
-                                                "end_col": 91,
-                                                "end_line": 92,
+                                                "end_col": 20,
+                                                "end_line": 138,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
-                                                "start_col": 76,
-                                                "start_line": 92
+                                                "start_col": 5,
+                                                "start_line": 138
                                             },
                                             "While handling calldata argument 'calldata'"
                                         ],
@@ -20155,8 +21758,8 @@
                                     },
                                     "While expanding the reference '__calldata_arg_calldata_len' in:"
                                 ],
-                                "start_col": 56,
-                                "start_line": 92
+                                "start_col": 5,
+                                "start_line": 137
                             },
                             "While handling calldata argument 'calldata_len'"
                         ],
@@ -20164,7 +21767,7 @@
                         "start_line": 1
                     }
                 },
-                "672": {
+                "712": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -20181,13 +21784,13 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 91,
-                                "end_line": 92,
+                                "end_col": 20,
+                                "end_line": 138,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
-                                "start_col": 76,
-                                "start_line": 92
+                                "start_col": 5,
+                                "start_line": 138
                             },
                             "While handling calldata argument 'calldata'"
                         ],
@@ -20195,7 +21798,7 @@
                         "start_line": 2
                     }
                 },
-                "673": {
+                "713": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -20212,8 +21815,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 74,
-                                "end_line": 92,
+                                "end_col": 23,
+                                "end_line": 137,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -20226,13 +21829,13 @@
                                         },
                                         "parent_location": [
                                             {
-                                                "end_col": 91,
-                                                "end_line": 92,
+                                                "end_col": 20,
+                                                "end_line": 138,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
-                                                "start_col": 76,
-                                                "start_line": 92
+                                                "start_col": 5,
+                                                "start_line": 138
                                             },
                                             "While handling calldata argument 'calldata'"
                                         ],
@@ -20241,8 +21844,8 @@
                                     },
                                     "While expanding the reference '__calldata_ptr' in:"
                                 ],
-                                "start_col": 56,
-                                "start_line": 92
+                                "start_col": 5,
+                                "start_line": 137
                             },
                             "While handling calldata argument 'calldata_len'"
                         ],
@@ -20250,7 +21853,7 @@
                         "start_line": 2
                     }
                 },
-                "675": {
+                "715": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -20267,8 +21870,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 74,
-                                "end_line": 92,
+                                "end_col": 23,
+                                "end_line": 137,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -20281,13 +21884,13 @@
                                         },
                                         "parent_location": [
                                             {
-                                                "end_col": 91,
-                                                "end_line": 92,
+                                                "end_col": 20,
+                                                "end_line": 138,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
-                                                "start_col": 76,
-                                                "start_line": 92
+                                                "start_col": 5,
+                                                "start_line": 138
                                             },
                                             "While handling calldata argument 'calldata'"
                                         ],
@@ -20296,8 +21899,8 @@
                                     },
                                     "While expanding the reference '__calldata_arg_calldata_len' in:"
                                 ],
-                                "start_col": 56,
-                                "start_line": 92
+                                "start_col": 5,
+                                "start_line": 137
                             },
                             "While handling calldata argument 'calldata_len'"
                         ],
@@ -20305,7 +21908,7 @@
                         "start_line": 1
                     }
                 },
-                "676": {
+                "716": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -20322,13 +21925,13 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 91,
-                                "end_line": 92,
+                                "end_col": 20,
+                                "end_line": 138,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
-                                "start_col": 76,
-                                "start_line": 92
+                                "start_col": 5,
+                                "start_line": 138
                             },
                             "While handling calldata argument 'calldata'"
                         ],
@@ -20336,7 +21939,7 @@
                         "start_line": 8
                     }
                 },
-                "677": {
+                "717": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -20354,12 +21957,12 @@
                         "parent_location": [
                             {
                                 "end_col": 17,
-                                "end_line": 86,
+                                "end_line": 128,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 86
+                                "start_line": 128
                             },
                             "While handling calldata of"
                         ],
@@ -20367,7 +21970,7 @@
                         "start_line": 1
                     }
                 },
-                "678": {
+                "718": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -20385,7 +21988,7 @@
                         "parent_location": [
                             {
                                 "end_col": 20,
-                                "end_line": 91,
+                                "end_line": 133,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -20398,8 +22001,8 @@
                                         },
                                         "parent_location": [
                                             {
-                                                "end_col": 54,
-                                                "end_line": 92,
+                                                "end_col": 34,
+                                                "end_line": 136,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
@@ -20412,8 +22015,8 @@
                                                         },
                                                         "parent_location": [
                                                             {
-                                                                "end_col": 91,
-                                                                "end_line": 92,
+                                                                "end_col": 20,
+                                                                "end_line": 138,
                                                                 "input_file": {
                                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                                 },
@@ -20427,12 +22030,12 @@
                                                                         "parent_location": [
                                                                             {
                                                                                 "end_col": 17,
-                                                                                "end_line": 86,
+                                                                                "end_line": 128,
                                                                                 "input_file": {
                                                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                                                 },
                                                                                 "start_col": 6,
-                                                                                "start_line": 86
+                                                                                "start_line": 128
                                                                             },
                                                                             "While constructing the external wrapper for:"
                                                                         ],
@@ -20441,8 +22044,8 @@
                                                                     },
                                                                     "While expanding the reference 'range_check_ptr' in:"
                                                                 ],
-                                                                "start_col": 76,
-                                                                "start_line": 92
+                                                                "start_col": 5,
+                                                                "start_line": 138
                                                             },
                                                             "While handling calldata argument 'calldata'"
                                                         ],
@@ -20451,8 +22054,8 @@
                                                     },
                                                     "While expanding the reference 'range_check_ptr' in:"
                                                 ],
-                                                "start_col": 25,
-                                                "start_line": 92
+                                                "start_col": 5,
+                                                "start_line": 136
                                             },
                                             "While handling calldata argument 'call_array'"
                                         ],
@@ -20462,7 +22065,7 @@
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
                                 "start_col": 5,
-                                "start_line": 91
+                                "start_line": 133
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -20470,7 +22073,7 @@
                         "start_line": 1
                     }
                 },
-                "679": {
+                "719": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -20488,7 +22091,7 @@
                         "parent_location": [
                             {
                                 "end_col": 23,
-                                "end_line": 87,
+                                "end_line": 129,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -20502,12 +22105,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 86,
+                                                "end_line": 128,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 86
+                                                "start_line": 128
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -20517,7 +22120,7 @@
                                     "While expanding the reference 'syscall_ptr' in:"
                                 ],
                                 "start_col": 5,
-                                "start_line": 87
+                                "start_line": 129
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -20525,7 +22128,7 @@
                         "start_line": 1
                     }
                 },
-                "680": {
+                "720": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -20543,7 +22146,7 @@
                         "parent_location": [
                             {
                                 "end_col": 31,
-                                "end_line": 88,
+                                "end_line": 130,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -20557,12 +22160,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 86,
+                                                "end_line": 128,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 86
+                                                "start_line": 128
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -20572,7 +22175,7 @@
                                     "While expanding the reference 'pedersen_ptr' in:"
                                 ],
                                 "start_col": 5,
-                                "start_line": 88
+                                "start_line": 130
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -20580,7 +22183,7 @@
                         "start_line": 1
                     }
                 },
-                "681": {
+                "721": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -20598,7 +22201,7 @@
                         "parent_location": [
                             {
                                 "end_col": 33,
-                                "end_line": 89,
+                                "end_line": 131,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -20612,12 +22215,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 86,
+                                                "end_line": 128,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 86
+                                                "start_line": 128
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -20627,7 +22230,7 @@
                                     "While expanding the reference 'ecdsa_ptr' in:"
                                 ],
                                 "start_col": 5,
-                                "start_line": 89
+                                "start_line": 131
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -20635,7 +22238,7 @@
                         "start_line": 1
                     }
                 },
-                "682": {
+                "722": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -20653,7 +22256,7 @@
                         "parent_location": [
                             {
                                 "end_col": 33,
-                                "end_line": 90,
+                                "end_line": 132,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -20667,12 +22270,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 86,
+                                                "end_line": 128,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 86
+                                                "start_line": 128
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -20682,7 +22285,7 @@
                                     "While expanding the reference 'bitwise_ptr' in:"
                                 ],
                                 "start_col": 5,
-                                "start_line": 90
+                                "start_line": 132
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -20690,7 +22293,7 @@
                         "start_line": 1
                     }
                 },
-                "683": {
+                "723": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -20707,8 +22310,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 91,
-                                "end_line": 92,
+                                "end_col": 20,
+                                "end_line": 138,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -20722,12 +22325,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 86,
+                                                "end_line": 128,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 86
+                                                "start_line": 128
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -20736,8 +22339,8 @@
                                     },
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
-                                "start_col": 76,
-                                "start_line": 92
+                                "start_col": 5,
+                                "start_line": 138
                             },
                             "While handling calldata argument 'calldata'"
                         ],
@@ -20745,7 +22348,7 @@
                         "start_line": 3
                     }
                 },
-                "685": {
+                "725": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -20762,8 +22365,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 23,
-                                "end_line": 92,
+                                "end_col": 25,
+                                "end_line": 135,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -20777,12 +22380,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 86,
+                                                "end_line": 128,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 86
+                                                "start_line": 128
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -20791,8 +22394,8 @@
                                     },
                                     "While expanding the reference '__calldata_arg_call_array_len' in:"
                                 ],
-                                "start_col": 3,
-                                "start_line": 92
+                                "start_col": 5,
+                                "start_line": 135
                             },
                             "While handling calldata argument 'call_array_len'"
                         ],
@@ -20800,7 +22403,7 @@
                         "start_line": 1
                     }
                 },
-                "686": {
+                "726": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -20817,8 +22420,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 54,
-                                "end_line": 92,
+                                "end_col": 34,
+                                "end_line": 136,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -20832,12 +22435,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 86,
+                                                "end_line": 128,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 86
+                                                "start_line": 128
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -20846,8 +22449,8 @@
                                     },
                                     "While expanding the reference '__calldata_arg_call_array' in:"
                                 ],
-                                "start_col": 25,
-                                "start_line": 92
+                                "start_col": 5,
+                                "start_line": 136
                             },
                             "While handling calldata argument 'call_array'"
                         ],
@@ -20855,7 +22458,7 @@
                         "start_line": 5
                     }
                 },
-                "688": {
+                "728": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -20872,8 +22475,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 74,
-                                "end_line": 92,
+                                "end_col": 23,
+                                "end_line": 137,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -20887,12 +22490,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 86,
+                                                "end_line": 128,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 86
+                                                "start_line": 128
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -20901,8 +22504,8 @@
                                     },
                                     "While expanding the reference '__calldata_arg_calldata_len' in:"
                                 ],
-                                "start_col": 56,
-                                "start_line": 92
+                                "start_col": 5,
+                                "start_line": 137
                             },
                             "While handling calldata argument 'calldata_len'"
                         ],
@@ -20910,7 +22513,7 @@
                         "start_line": 1
                     }
                 },
-                "689": {
+                "729": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -20927,8 +22530,8 @@
                         },
                         "parent_location": [
                             {
-                                "end_col": 91,
-                                "end_line": 92,
+                                "end_col": 20,
+                                "end_line": 138,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -20942,12 +22545,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 86,
+                                                "end_line": 128,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 86
+                                                "start_line": 128
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -20956,8 +22559,8 @@
                                     },
                                     "While expanding the reference '__calldata_arg_calldata' in:"
                                 ],
-                                "start_col": 76,
-                                "start_line": 92
+                                "start_col": 5,
+                                "start_line": 138
                             },
                             "While handling calldata argument 'calldata'"
                         ],
@@ -20965,7 +22568,7 @@
                         "start_line": 5
                     }
                 },
-                "691": {
+                "731": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -20976,15 +22579,15 @@
                     "hints": [],
                     "inst": {
                         "end_col": 17,
-                        "end_line": 86,
+                        "end_line": 128,
                         "input_file": {
                             "filename": "src/openzeppelin/account/presets/Account.cairo"
                         },
                         "start_col": 6,
-                        "start_line": 86
+                        "start_line": 128
                     }
                 },
-                "693": {
+                "733": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -21002,7 +22605,7 @@
                         "parent_location": [
                             {
                                 "end_col": 17,
-                                "end_line": 86,
+                                "end_line": 128,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -21016,12 +22619,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 86,
+                                                "end_line": 128,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 86
+                                                "start_line": 128
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -21031,7 +22634,7 @@
                                     "While auto generating local variable for 'syscall_ptr'."
                                 ],
                                 "start_col": 6,
-                                "start_line": 86
+                                "start_line": 128
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -21039,7 +22642,7 @@
                         "start_line": 1
                     }
                 },
-                "694": {
+                "734": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -21057,7 +22660,7 @@
                         "parent_location": [
                             {
                                 "end_col": 17,
-                                "end_line": 86,
+                                "end_line": 128,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -21071,12 +22674,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 86,
+                                                "end_line": 128,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 86
+                                                "start_line": 128
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -21086,7 +22689,7 @@
                                     "While auto generating local variable for 'pedersen_ptr'."
                                 ],
                                 "start_col": 6,
-                                "start_line": 86
+                                "start_line": 128
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -21094,7 +22697,7 @@
                         "start_line": 1
                     }
                 },
-                "695": {
+                "735": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -21112,7 +22715,7 @@
                         "parent_location": [
                             {
                                 "end_col": 17,
-                                "end_line": 86,
+                                "end_line": 128,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -21126,12 +22729,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 86,
+                                                "end_line": 128,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 86
+                                                "start_line": 128
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -21141,7 +22744,7 @@
                                     "While auto generating local variable for 'ecdsa_ptr'."
                                 ],
                                 "start_col": 6,
-                                "start_line": 86
+                                "start_line": 128
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -21149,7 +22752,7 @@
                         "start_line": 1
                     }
                 },
-                "696": {
+                "736": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -21167,7 +22770,7 @@
                         "parent_location": [
                             {
                                 "end_col": 17,
-                                "end_line": 86,
+                                "end_line": 128,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -21181,12 +22784,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 86,
+                                                "end_line": 128,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 86
+                                                "start_line": 128
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -21196,7 +22799,7 @@
                                     "While auto generating local variable for 'bitwise_ptr'."
                                 ],
                                 "start_col": 6,
-                                "start_line": 86
+                                "start_line": 128
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -21204,7 +22807,7 @@
                         "start_line": 1
                     }
                 },
-                "697": {
+                "737": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -21222,7 +22825,7 @@
                         "parent_location": [
                             {
                                 "end_col": 17,
-                                "end_line": 86,
+                                "end_line": 128,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -21236,12 +22839,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 86,
+                                                "end_line": 128,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 86
+                                                "start_line": 128
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -21251,7 +22854,7 @@
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 86
+                                "start_line": 128
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -21259,7 +22862,7 @@
                         "start_line": 1
                     }
                 },
-                "698": {
+                "738": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -21277,12 +22880,12 @@
                         "parent_location": [
                             {
                                 "end_col": 17,
-                                "end_line": 86,
+                                "end_line": 128,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 86
+                                "start_line": 128
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -21290,7 +22893,7 @@
                         "start_line": 2
                     }
                 },
-                "700": {
+                "740": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -21308,7 +22911,7 @@
                         "parent_location": [
                             {
                                 "end_col": 17,
-                                "end_line": 86,
+                                "end_line": 128,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -21322,7 +22925,7 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 86,
+                                                "end_line": 128,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
@@ -21336,12 +22939,12 @@
                                                         "parent_location": [
                                                             {
                                                                 "end_col": 17,
-                                                                "end_line": 86,
+                                                                "end_line": 128,
                                                                 "input_file": {
                                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                                 },
                                                                 "start_col": 6,
-                                                                "start_line": 86
+                                                                "start_line": 128
                                                             },
                                                             "While constructing the external wrapper for:"
                                                         ],
@@ -21351,7 +22954,7 @@
                                                     "While expanding the reference 'syscall_ptr' in:"
                                                 ],
                                                 "start_col": 6,
-                                                "start_line": 86
+                                                "start_line": 128
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -21361,7 +22964,7 @@
                                     "While auto generating local variable for 'syscall_ptr'."
                                 ],
                                 "start_col": 6,
-                                "start_line": 86
+                                "start_line": 128
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -21369,7 +22972,7 @@
                         "start_line": 1
                     }
                 },
-                "701": {
+                "741": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -21387,7 +22990,7 @@
                         "parent_location": [
                             {
                                 "end_col": 17,
-                                "end_line": 86,
+                                "end_line": 128,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -21401,7 +23004,7 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 86,
+                                                "end_line": 128,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
@@ -21415,12 +23018,12 @@
                                                         "parent_location": [
                                                             {
                                                                 "end_col": 17,
-                                                                "end_line": 86,
+                                                                "end_line": 128,
                                                                 "input_file": {
                                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                                 },
                                                                 "start_col": 6,
-                                                                "start_line": 86
+                                                                "start_line": 128
                                                             },
                                                             "While constructing the external wrapper for:"
                                                         ],
@@ -21430,7 +23033,7 @@
                                                     "While expanding the reference 'pedersen_ptr' in:"
                                                 ],
                                                 "start_col": 6,
-                                                "start_line": 86
+                                                "start_line": 128
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -21440,7 +23043,7 @@
                                     "While auto generating local variable for 'pedersen_ptr'."
                                 ],
                                 "start_col": 6,
-                                "start_line": 86
+                                "start_line": 128
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -21448,7 +23051,7 @@
                         "start_line": 1
                     }
                 },
-                "702": {
+                "742": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -21466,7 +23069,7 @@
                         "parent_location": [
                             {
                                 "end_col": 17,
-                                "end_line": 86,
+                                "end_line": 128,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -21480,12 +23083,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 86,
+                                                "end_line": 128,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 86
+                                                "start_line": 128
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -21495,7 +23098,7 @@
                                     "While expanding the reference 'range_check_ptr' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 86
+                                "start_line": 128
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -21503,7 +23106,7 @@
                         "start_line": 2
                     }
                 },
-                "703": {
+                "743": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -21521,7 +23124,7 @@
                         "parent_location": [
                             {
                                 "end_col": 17,
-                                "end_line": 86,
+                                "end_line": 128,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -21535,7 +23138,7 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 86,
+                                                "end_line": 128,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
@@ -21549,12 +23152,12 @@
                                                         "parent_location": [
                                                             {
                                                                 "end_col": 17,
-                                                                "end_line": 86,
+                                                                "end_line": 128,
                                                                 "input_file": {
                                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                                 },
                                                                 "start_col": 6,
-                                                                "start_line": 86
+                                                                "start_line": 128
                                                             },
                                                             "While constructing the external wrapper for:"
                                                         ],
@@ -21564,7 +23167,7 @@
                                                     "While expanding the reference 'ecdsa_ptr' in:"
                                                 ],
                                                 "start_col": 6,
-                                                "start_line": 86
+                                                "start_line": 128
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -21574,7 +23177,7 @@
                                     "While auto generating local variable for 'ecdsa_ptr'."
                                 ],
                                 "start_col": 6,
-                                "start_line": 86
+                                "start_line": 128
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -21582,7 +23185,7 @@
                         "start_line": 1
                     }
                 },
-                "704": {
+                "744": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -21600,7 +23203,7 @@
                         "parent_location": [
                             {
                                 "end_col": 17,
-                                "end_line": 86,
+                                "end_line": 128,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -21614,7 +23217,7 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 86,
+                                                "end_line": 128,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
@@ -21628,12 +23231,12 @@
                                                         "parent_location": [
                                                             {
                                                                 "end_col": 17,
-                                                                "end_line": 86,
+                                                                "end_line": 128,
                                                                 "input_file": {
                                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                                 },
                                                                 "start_col": 6,
-                                                                "start_line": 86
+                                                                "start_line": 128
                                                             },
                                                             "While constructing the external wrapper for:"
                                                         ],
@@ -21643,7 +23246,7 @@
                                                     "While expanding the reference 'bitwise_ptr' in:"
                                                 ],
                                                 "start_col": 6,
-                                                "start_line": 86
+                                                "start_line": 128
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -21653,7 +23256,7 @@
                                     "While auto generating local variable for 'bitwise_ptr'."
                                 ],
                                 "start_col": 6,
-                                "start_line": 86
+                                "start_line": 128
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -21661,7 +23264,7 @@
                         "start_line": 1
                     }
                 },
-                "705": {
+                "745": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -21679,7 +23282,7 @@
                         "parent_location": [
                             {
                                 "end_col": 17,
-                                "end_line": 86,
+                                "end_line": 128,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -21693,12 +23296,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 86,
+                                                "end_line": 128,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 86
+                                                "start_line": 128
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -21708,7 +23311,7 @@
                                     "While expanding the reference 'retdata_size' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 86
+                                "start_line": 128
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -21716,7 +23319,7 @@
                         "start_line": 2
                     }
                 },
-                "706": {
+                "746": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -21734,7 +23337,7 @@
                         "parent_location": [
                             {
                                 "end_col": 17,
-                                "end_line": 86,
+                                "end_line": 128,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
@@ -21748,12 +23351,12 @@
                                         "parent_location": [
                                             {
                                                 "end_col": 17,
-                                                "end_line": 86,
+                                                "end_line": 128,
                                                 "input_file": {
                                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                                 },
                                                 "start_col": 6,
-                                                "start_line": 86
+                                                "start_line": 128
                                             },
                                             "While constructing the external wrapper for:"
                                         ],
@@ -21763,7 +23366,7 @@
                                     "While expanding the reference 'retdata' in:"
                                 ],
                                 "start_col": 6,
-                                "start_line": 86
+                                "start_line": 128
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -21771,7 +23374,7 @@
                         "start_line": 2
                     }
                 },
-                "707": {
+                "747": {
                     "accessible_scopes": [
                         "__main__",
                         "__main__",
@@ -21789,12 +23392,12 @@
                         "parent_location": [
                             {
                                 "end_col": 17,
-                                "end_line": 86,
+                                "end_line": 128,
                                 "input_file": {
                                     "filename": "src/openzeppelin/account/presets/Account.cairo"
                                 },
                                 "start_col": 6,
-                                "start_line": 86
+                                "start_line": 128
                             },
                             "While constructing the external wrapper for:"
                         ],
@@ -22233,7 +23836,25 @@
                     }
                 }
             ],
-            "640": [
+            "657": [
+                {
+                    "accessible_scopes": [
+                        "__main__",
+                        "__main__",
+                        "__wrappers__",
+                        "__wrappers__.__validate_deploy__"
+                    ],
+                    "code": "memory[ap] = segments.add()",
+                    "flow_tracking_data": {
+                        "ap_tracking": {
+                            "group": 49,
+                            "offset": 65
+                        },
+                        "reference_ids": {}
+                    }
+                }
+            ],
+            "680": [
                 {
                     "accessible_scopes": [
                         "__main__",
@@ -22244,7 +23865,7 @@
                     "code": "memory[ap] = segments.add()",
                     "flow_tracking_data": {
                         "ap_tracking": {
-                            "group": 50,
+                            "group": 52,
                             "offset": 0
                         },
                         "reference_ids": {}
@@ -22277,7 +23898,7 @@
                 "decorators": [
                     "external"
                 ],
-                "pc": 628,
+                "pc": 668,
                 "type": "function"
             },
             "__main__.__execute__.Args": {
@@ -22448,6 +24069,63 @@
                 "type": "const",
                 "value": 0
             },
+            "__main__.__validate_deploy__": {
+                "decorators": [
+                    "external"
+                ],
+                "pc": 628,
+                "type": "function"
+            },
+            "__main__.__validate_deploy__.Args": {
+                "full_name": "__main__.__validate_deploy__.Args",
+                "members": {
+                    "class_hash": {
+                        "cairo_type": "felt",
+                        "offset": 0
+                    },
+                    "publicKey": {
+                        "cairo_type": "felt",
+                        "offset": 2
+                    },
+                    "salt": {
+                        "cairo_type": "felt",
+                        "offset": 1
+                    }
+                },
+                "size": 3,
+                "type": "struct"
+            },
+            "__main__.__validate_deploy__.ImplicitArgs": {
+                "full_name": "__main__.__validate_deploy__.ImplicitArgs",
+                "members": {
+                    "ecdsa_ptr": {
+                        "cairo_type": "starkware.cairo.common.cairo_builtins.SignatureBuiltin*",
+                        "offset": 2
+                    },
+                    "pedersen_ptr": {
+                        "cairo_type": "starkware.cairo.common.cairo_builtins.HashBuiltin*",
+                        "offset": 1
+                    },
+                    "range_check_ptr": {
+                        "cairo_type": "felt",
+                        "offset": 3
+                    },
+                    "syscall_ptr": {
+                        "cairo_type": "felt*",
+                        "offset": 0
+                    }
+                },
+                "size": 4,
+                "type": "struct"
+            },
+            "__main__.__validate_deploy__.Return": {
+                "cairo_type": "()",
+                "type": "type_definition"
+            },
+            "__main__.__validate_deploy__.SIZEOF_LOCALS": {
+                "type": "const",
+                "value": 0
+            },
             "__main__.constructor": {
                 "decorators": [
                     "constructor"
@@ -22688,7 +24366,7 @@
                 "decorators": [
                     "external"
                 ],
-                "pc": 659,
+                "pc": 699,
                 "type": "function"
             },
             "__wrappers__.__execute__.Args": {
@@ -22717,7 +24395,7 @@
             },
             "__wrappers__.__execute___encode_return": {
                 "decorators": [],
-                "pc": 640,
+                "pc": 680,
                 "type": "function"
             },
             "__wrappers__.__execute___encode_return.Args": {
@@ -22823,6 +24501,41 @@
                 "destination": "starkware.cairo.common.memcpy.memcpy",
                 "type": "alias"
             },
+            "__wrappers__.__validate_deploy__": {
+                "decorators": [
+                    "external"
+                ],
+                "pc": 645,
+                "type": "function"
+            },
+            "__wrappers__.__validate_deploy__.Args": {
+                "full_name": "__wrappers__.__validate_deploy__.Args",
+                "members": {},
+                "size": 0,
+                "type": "struct"
+            },
+            "__wrappers__.__validate_deploy__.ImplicitArgs": {
+                "full_name": "__wrappers__.__validate_deploy__.ImplicitArgs",
+                "members": {},
+                "size": 0,
+                "type": "struct"
+            },
+            "__wrappers__.__validate_deploy__.Return": {
+                "cairo_type": "(syscall_ptr: felt*, pedersen_ptr: starkware.cairo.common.cairo_builtins.HashBuiltin*, range_check_ptr: felt, ecdsa_ptr: starkware.cairo.common.cairo_builtins.SignatureBuiltin*, bitwise_ptr: felt, size: felt, retdata: felt*)",
+                "type": "type_definition"
+            },
+            "__wrappers__.__validate_deploy__.SIZEOF_LOCALS": {
+                "type": "const",
+                "value": 0
+            },
+            "__wrappers__.__validate_deploy__.__wrapped_func": {
+                "destination": "__main__.__validate_deploy__",
+                "type": "alias"
+            },
+            "__wrappers__.__validate_deploy___encode_return.memcpy": {
+                "destination": "starkware.cairo.common.memcpy.memcpy",
+                "type": "alias"
+            },
             "__wrappers__.constructor": {
                 "decorators": [
                     "constructor"
diff --git a/src/nile/artifacts/abis/Account.json b/src/nile/artifacts/abis/Account.json
index 5c939afc..7099a85b 100644
--- a/src/nile/artifacts/abis/Account.json
+++ b/src/nile/artifacts/abis/Account.json
@@ -136,6 +136,25 @@
         "outputs": [],
         "type": "function"
     },
+    {
+        "inputs": [
+            {
+                "name": "class_hash",
+                "type": "felt"
+            },
+            {
+                "name": "salt",
+                "type": "felt"
+            },
+            {
+                "name": "publicKey",
+                "type": "felt"
+            }
+        ],
+        "name": "__validate_deploy__",
+        "outputs": [],
+        "type": "function"
+    },
     {
         "inputs": [
             {

From 95f81fd4b640951c45199daa41e796e422c498aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Triay?= <martriay@gmail.com>
Date: Thu, 17 Nov 2022 20:34:32 -0300
Subject: [PATCH 088/109] add get_balance and conterfactual_address

---
 src/nile/artifacts/abis/ERC20.json | 274 +++++++++++++++++++++++++++++
 src/nile/cli.py                    |  23 ++-
 src/nile/common.py                 |   3 +
 src/nile/core/account.py           |  26 ++-
 src/nile/core/call_or_invoke.py    |   5 +-
 src/nile/nre.py                    |  14 +-
 src/nile/utils/get_accounts.py     |   2 +-
 7 files changed, 327 insertions(+), 20 deletions(-)
 create mode 100644 src/nile/artifacts/abis/ERC20.json

diff --git a/src/nile/artifacts/abis/ERC20.json b/src/nile/artifacts/abis/ERC20.json
new file mode 100644
index 00000000..05922ead
--- /dev/null
+++ b/src/nile/artifacts/abis/ERC20.json
@@ -0,0 +1,274 @@
+[
+  {
+      "members": [
+          {
+              "name": "low",
+              "offset": 0,
+              "type": "felt"
+          },
+          {
+              "name": "high",
+              "offset": 1,
+              "type": "felt"
+          }
+      ],
+      "name": "Uint256",
+      "size": 2,
+      "type": "struct"
+  },
+  {
+      "data": [
+          {
+              "name": "from_",
+              "type": "felt"
+          },
+          {
+              "name": "to",
+              "type": "felt"
+          },
+          {
+              "name": "value",
+              "type": "Uint256"
+          }
+      ],
+      "keys": [],
+      "name": "Transfer",
+      "type": "event"
+  },
+  {
+      "data": [
+          {
+              "name": "owner",
+              "type": "felt"
+          },
+          {
+              "name": "spender",
+              "type": "felt"
+          },
+          {
+              "name": "value",
+              "type": "Uint256"
+          }
+      ],
+      "keys": [],
+      "name": "Approval",
+      "type": "event"
+  },
+  {
+      "inputs": [
+          {
+              "name": "name",
+              "type": "felt"
+          },
+          {
+              "name": "symbol",
+              "type": "felt"
+          },
+          {
+              "name": "decimals",
+              "type": "felt"
+          },
+          {
+              "name": "initial_supply",
+              "type": "Uint256"
+          },
+          {
+              "name": "recipient",
+              "type": "felt"
+          }
+      ],
+      "name": "constructor",
+      "outputs": [],
+      "type": "constructor"
+  },
+  {
+      "inputs": [],
+      "name": "name",
+      "outputs": [
+          {
+              "name": "name",
+              "type": "felt"
+          }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+  },
+  {
+      "inputs": [],
+      "name": "symbol",
+      "outputs": [
+          {
+              "name": "symbol",
+              "type": "felt"
+          }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+  },
+  {
+      "inputs": [],
+      "name": "totalSupply",
+      "outputs": [
+          {
+              "name": "totalSupply",
+              "type": "Uint256"
+          }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+  },
+  {
+      "inputs": [],
+      "name": "decimals",
+      "outputs": [
+          {
+              "name": "decimals",
+              "type": "felt"
+          }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+  },
+  {
+      "inputs": [
+          {
+              "name": "account",
+              "type": "felt"
+          }
+      ],
+      "name": "balanceOf",
+      "outputs": [
+          {
+              "name": "balance",
+              "type": "Uint256"
+          }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+  },
+  {
+      "inputs": [
+          {
+              "name": "owner",
+              "type": "felt"
+          },
+          {
+              "name": "spender",
+              "type": "felt"
+          }
+      ],
+      "name": "allowance",
+      "outputs": [
+          {
+              "name": "remaining",
+              "type": "Uint256"
+          }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+  },
+  {
+      "inputs": [
+          {
+              "name": "recipient",
+              "type": "felt"
+          },
+          {
+              "name": "amount",
+              "type": "Uint256"
+          }
+      ],
+      "name": "transfer",
+      "outputs": [
+          {
+              "name": "success",
+              "type": "felt"
+          }
+      ],
+      "type": "function"
+  },
+  {
+      "inputs": [
+          {
+              "name": "sender",
+              "type": "felt"
+          },
+          {
+              "name": "recipient",
+              "type": "felt"
+          },
+          {
+              "name": "amount",
+              "type": "Uint256"
+          }
+      ],
+      "name": "transferFrom",
+      "outputs": [
+          {
+              "name": "success",
+              "type": "felt"
+          }
+      ],
+      "type": "function"
+  },
+  {
+      "inputs": [
+          {
+              "name": "spender",
+              "type": "felt"
+          },
+          {
+              "name": "amount",
+              "type": "Uint256"
+          }
+      ],
+      "name": "approve",
+      "outputs": [
+          {
+              "name": "success",
+              "type": "felt"
+          }
+      ],
+      "type": "function"
+  },
+  {
+      "inputs": [
+          {
+              "name": "spender",
+              "type": "felt"
+          },
+          {
+              "name": "added_value",
+              "type": "Uint256"
+          }
+      ],
+      "name": "increaseAllowance",
+      "outputs": [
+          {
+              "name": "success",
+              "type": "felt"
+          }
+      ],
+      "type": "function"
+  },
+  {
+      "inputs": [
+          {
+              "name": "spender",
+              "type": "felt"
+          },
+          {
+              "name": "subtracted_value",
+              "type": "Uint256"
+          }
+      ],
+      "name": "decreaseAllowance",
+      "outputs": [
+          {
+              "name": "success",
+              "type": "felt"
+          }
+      ],
+      "type": "function"
+  }
+]
diff --git a/src/nile/cli.py b/src/nile/cli.py
index a42396de..85a25ca8 100644
--- a/src/nile/cli.py
+++ b/src/nile/cli.py
@@ -2,10 +2,11 @@
 """Nile CLI entry point."""
 import logging
 
+import os
 import asyncclick as click
 
 from nile.common import is_alias
-from nile.core.account import Account
+from nile.core.account import Account, get_counterfactual_address
 from nile.core.call_or_invoke import call_or_invoke as call_or_invoke_command
 from nile.core.clean import clean as clean_command
 from nile.core.compile import compile as compile_command
@@ -16,13 +17,14 @@
 from nile.core.run import run as run_command
 from nile.core.test import test as test_command
 from nile.core.version import version as version_command
-from nile.utils import normalize_number
+from nile.utils import normalize_number, hex_address
 from nile.utils.get_accounts import get_accounts as get_accounts_command
 from nile.utils.get_accounts import (
     get_predeployed_accounts as get_predeployed_accounts_command,
 )
 from nile.utils.get_nonce import get_nonce as get_nonce_command
 from nile.utils.status import status as status_command
+from nile.signer import Signer
 
 logging.basicConfig(level=logging.DEBUG, format="%(message)s")
 logging.getLogger("asyncio").setLevel(logging.WARNING)
@@ -154,6 +156,16 @@ async def setup(signer, network, salt, max_fee, watch_mode):
     await Account(signer, network, salt, max_fee, watch_mode=watch_mode)
 
 
+@cli.command()
+@click.argument("signer", nargs=1)
+@click.option("--salt", nargs=1, default=None)
+async def conterfactual_address(signer, salt):
+    """Precompute the address of an Account contract."""
+    _signer = Signer(normalize_number(os.environ[signer]))
+    address = hex_address(get_counterfactual_address(salt, calldata=[_signer.public_key]))
+    logging.info(address)
+
+
 @cli.command()
 @click.argument("signer", nargs=1)
 @click.argument("address_or_alias", nargs=1)
@@ -206,7 +218,6 @@ async def call(address_or_alias, method, params, network):
         address_or_alias, "call", method, params, network
     )
     logging.info(out)
-    return out
 
 
 @cli.command()
@@ -334,9 +345,9 @@ async def status(tx_hash, network, watch_mode, contracts_file):
 async def get_accounts(network, predeployed):
     """Retrieve and manage deployed accounts."""
     if not predeployed:
-        return await get_accounts_command(network)
+        await get_accounts_command(network)
     else:
-        return await get_predeployed_accounts_command(network)
+        await get_predeployed_accounts_command(network)
 
 
 @cli.command()
@@ -344,7 +355,7 @@ async def get_accounts(network, predeployed):
 @network_option
 async def get_nonce(contract_address, network):
     """Retrieve the nonce for a contract."""
-    return await get_nonce_command(normalize_number(contract_address), network)
+    await get_nonce_command(normalize_number(contract_address), network)
 
 
 cli = load_plugins(cli)
diff --git a/src/nile/common.py b/src/nile/common.py
index 749b4d9d..8a777440 100644
--- a/src/nile/common.py
+++ b/src/nile/common.py
@@ -9,6 +9,7 @@
 
 from nile.utils import hex_class_hash, normalize_number, str_to_felt
 
+pt = os.path.dirname(os.path.realpath(__file__)).replace("/core", "")
 CONTRACTS_DIRECTORY = "contracts"
 BUILD_DIRECTORY = "artifacts"
 TEMP_DIRECTORY = ".temp"
@@ -21,6 +22,8 @@
 TRANSACTION_VERSION = 1
 QUERY_VERSION_BASE = 2**128
 QUERY_VERSION = QUERY_VERSION_BASE + TRANSACTION_VERSION
+ETH_ABI = f"{pt}/artifacts/abis/ERC20.json"
+ETH_ADDRESS = "0x49D36570D4E46F48E99674BD3FCC84644DDD6B96F7C741B1562B82F9E004DC7"
 UNIVERSAL_DEPLOYER_ADDRESS = (
     # subject to change
     "0x041a78e741e5af2fec34b695679bc6891742439f7afb8484ecd7766661ad02bf"
diff --git a/src/nile/core/account.py b/src/nile/core/account.py
index 788fe253..e6805ab7 100644
--- a/src/nile/core/account.py
+++ b/src/nile/core/account.py
@@ -103,16 +103,11 @@ async def deploy(self, salt=0, max_fee=None, query_type=None, watch_mode=None):
         overriding_path = (f"{pt}/artifacts", f"{pt}/artifacts/abis")
 
         salt = normalize_number(salt)
-        class_hash = get_hash("Account")
+        class_hash = get_account_hash("Account")
         max_fee = 0 if max_fee is None else normalize_number(max_fee)
         calldata = [self.signer.public_key]
 
-        contract_address = calculate_contract_address_from_hash(
-            salt=salt,
-            class_hash=class_hash,
-            constructor_calldata=calldata,
-            deployer_address=0,
-        )
+        contract_address = get_counterfactual_address(salt, calldata)
 
         signature = self.signer.sign_deployment(
             contract_address,
@@ -254,7 +249,7 @@ def _get_target_address(self, address_or_alias):
 
         target_address, _ = (
             next(deployments.load(address_or_alias, self.network), None)
-            or address_or_alias
+            or (address_or_alias, None)
         )
 
         return target_address
@@ -269,3 +264,18 @@ async def _process_arguments(self, max_fee, nonce, calldata=None):
             calldata = [normalize_number(x) for x in calldata]
 
         return max_fee, nonce, calldata
+
+def get_account_hash(contract="Account"):
+    pt = os.path.dirname(os.path.realpath(__file__)).replace("/core", "")
+    overriding_path = (f"{pt}/artifacts", f"{pt}/artifacts/abis")
+    return get_hash(contract, overriding_path=overriding_path)
+
+def get_counterfactual_address(salt=None, calldata=[], contract="Account"):
+    class_hash = get_account_hash(contract)
+    salt = 0 if salt is None else int(salt)
+    return calculate_contract_address_from_hash(
+        salt=salt,
+        class_hash=int(class_hash, 16),
+        constructor_calldata=calldata,
+        deployer_address=0,
+    )
diff --git a/src/nile/core/call_or_invoke.py b/src/nile/core/call_or_invoke.py
index ad29c0bb..e563b392 100644
--- a/src/nile/core/call_or_invoke.py
+++ b/src/nile/core/call_or_invoke.py
@@ -15,6 +15,7 @@ async def call_or_invoke(
     method,
     params,
     network,
+    abi=None,
     signature=None,
     max_fee=None,
     query_flag=None,
@@ -36,8 +37,10 @@ async def call_or_invoke(
     if isinstance(contract, account.Account):
         address = contract.address
         abi = contract.abi_path
-    else:
+    elif abi is None:
         address, abi = next(deployments.load(contract, network))
+    else:
+        address = contract
 
     try:
         output = await execute_call(
diff --git a/src/nile/nre.py b/src/nile/nre.py
index 2aad2e83..8196c1fb 100644
--- a/src/nile/nre.py
+++ b/src/nile/nre.py
@@ -1,12 +1,12 @@
 """nile runtime environment."""
 from nile import deployments
-from nile.common import is_alias
+from nile.common import is_alias, ETH_ADDRESS, ETH_ABI
 from nile.core.account import Account
 from nile.core.call_or_invoke import call_or_invoke
 from nile.core.compile import compile
 from nile.core.deploy import deploy
 from nile.core.plugins import get_installed_plugins, skip_click_exit
-from nile.utils import normalize_number
+from nile.utils import normalize_number, from_uint
 from nile.utils.get_accounts import get_accounts, get_predeployed_accounts
 from nile.utils.get_nonce import get_nonce
 
@@ -46,11 +46,11 @@ def deploy(
             watch_mode=watch_mode,
         )
 
-    def call(self, address_or_alias, method, params=None):
+    def call(self, address_or_alias, method, params=None, abi=None):
         """Call a view function in a smart contract."""
         if not is_alias(address_or_alias):
             address_or_alias = normalize_number(address_or_alias)
-        return call_or_invoke(address_or_alias, "call", method, params, self.network)
+        return call_or_invoke(address_or_alias, "call", method, params, self.network, abi=abi)
 
     def get_deployment(self, address_or_alias):
         """Get a deployment by its identifier (address or alias)."""
@@ -78,3 +78,9 @@ def get_accounts(self, predeployed=False):
     def get_nonce(self, contract_address):
         """Retrieve the nonce for a contract."""
         return get_nonce(contract_address, self.network)
+
+    async def get_balance(self, account):
+        output = await self.call(ETH_ADDRESS, "balanceOf", [account], abi=ETH_ABI)
+        low, high = output.split()
+        res = from_uint([int(low, 16), int(high, 16)])
+        return res
diff --git a/src/nile/utils/get_accounts.py b/src/nile/utils/get_accounts.py
index 940f8c6b..5bf7a8ad 100644
--- a/src/nile/utils/get_accounts.py
+++ b/src/nile/utils/get_accounts.py
@@ -85,7 +85,7 @@ async def get_predeployed_accounts(network):
 
 
 async def _check_and_return_account(signer, pubkey, network, predeployed_info=None):
-    account = await Account(signer, network, predeployed_info)
+    account = await Account(signer, network, predeployed_info=predeployed_info)
     assert (str(pubkey)) == str(
         account.signer.public_key
     ), "Signer pubkey does not match deployed pubkey"

From 224fe971aff15b965ca454134a6e2dedc8d0d1e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Triay?= <martriay@gmail.com>
Date: Fri, 18 Nov 2022 01:55:32 -0300
Subject: [PATCH 089/109] fix tests and implementations

---
 src/nile/common.py             |  5 +++++
 src/nile/core/account.py       | 35 +++++++++++++++++-----------------
 src/nile/core/deploy.py        |  9 +++++----
 tests/commands/test_account.py |  4 ++--
 4 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/src/nile/common.py b/src/nile/common.py
index 8a777440..cd2c3831 100644
--- a/src/nile/common.py
+++ b/src/nile/common.py
@@ -136,6 +136,11 @@ def get_hash(contract_name, overriding_path=None):
         compute_class_hash(contract_class=contract_class, hash_func=pedersen_hash)
     )
 
+def get_account_hash(contract="Account"):
+    """Return the class_hash of an Account contract."""
+    pt = os.path.dirname(os.path.realpath(__file__)).replace("/core", "")
+    overriding_path = (f"{pt}/artifacts", f"{pt}/artifacts/abis")
+    return int(get_hash(contract, overriding_path=overriding_path), 16)
 
 def get_addresses_from_string(string):
     """Return a set of integers with identified addresses in a string."""
diff --git a/src/nile/core/account.py b/src/nile/core/account.py
index e6805ab7..6c132cc7 100644
--- a/src/nile/core/account.py
+++ b/src/nile/core/account.py
@@ -14,6 +14,7 @@
     UNIVERSAL_DEPLOYER_ADDRESS,
     get_contract_class,
     get_hash,
+    get_account_hash,
     is_alias,
     normalize_number,
 )
@@ -90,11 +91,13 @@ async def __init__(
             self.address = signer_data["address"]
             self.index = signer_data["index"]
         else:
-            address, index = await self.deploy(
+            output = await self.deploy(
                 salt=salt, max_fee=max_fee, watch_mode=watch_mode
             )
-            self.address = address
-            self.index = index
+            if output is not None:
+                address, index = output
+                self.address = address
+                self.index = index
 
     async def deploy(self, salt=0, max_fee=None, query_type=None, watch_mode=None):
         """Deploy an Account contract for the given private key."""
@@ -102,14 +105,14 @@ async def deploy(self, salt=0, max_fee=None, query_type=None, watch_mode=None):
         pt = os.path.dirname(os.path.realpath(__file__)).replace("/core", "")
         overriding_path = (f"{pt}/artifacts", f"{pt}/artifacts/abis")
 
-        salt = normalize_number(salt)
         class_hash = get_account_hash("Account")
+        salt = 0 if salt is None else normalize_number(salt)
         max_fee = 0 if max_fee is None else normalize_number(max_fee)
         calldata = [self.signer.public_key]
 
         contract_address = get_counterfactual_address(salt, calldata)
 
-        signature = self.signer.sign_deployment(
+        [sig_r, sig_s] = self.signer.sign_deployment(
             contract_address,
             class_hash,
             calldata,
@@ -118,22 +121,23 @@ async def deploy(self, salt=0, max_fee=None, query_type=None, watch_mode=None):
             0,  # nonce starts at 0
         )
 
-        address, _ = await deploy_account(
+        output = await deploy_account(
             network=self.network,
             salt=salt,
             calldata=calldata,
-            signature=signature,
+            signature=[sig_r, sig_s],
             max_fee=max_fee,
             query_type=query_type,
             overriding_path=overriding_path,
             watch_mode=watch_mode,
         )
 
-        accounts.register(
-            self.signer.public_key, address, index, self.alias, self.network
-        )
-
-        return address, index
+        if output is not None:
+            address, _ = output
+            accounts.register(
+                self.signer.public_key, address, index, self.alias, self.network
+            )
+            return address, index
 
     async def declare(
         self,
@@ -265,17 +269,12 @@ async def _process_arguments(self, max_fee, nonce, calldata=None):
 
         return max_fee, nonce, calldata
 
-def get_account_hash(contract="Account"):
-    pt = os.path.dirname(os.path.realpath(__file__)).replace("/core", "")
-    overriding_path = (f"{pt}/artifacts", f"{pt}/artifacts/abis")
-    return get_hash(contract, overriding_path=overriding_path)
-
 def get_counterfactual_address(salt=None, calldata=[], contract="Account"):
     class_hash = get_account_hash(contract)
     salt = 0 if salt is None else int(salt)
     return calculate_contract_address_from_hash(
         salt=salt,
-        class_hash=int(class_hash, 16),
+        class_hash=class_hash,
         constructor_calldata=calldata,
         deployer_address=0,
     )
diff --git a/src/nile/core/deploy.py b/src/nile/core/deploy.py
index 484b1486..f69adde9 100644
--- a/src/nile/core/deploy.py
+++ b/src/nile/core/deploy.py
@@ -9,7 +9,7 @@
     BUILD_DIRECTORY,
     QUERY_VERSION,
     TRANSACTION_VERSION,
-    get_hash,
+    get_account_hash,
     parse_information,
 )
 from nile.starknet_cli import execute_call, get_gateway_response
@@ -84,7 +84,7 @@ async def deploy_account(
     )
     register_abi = abi if abi is not None else f"{base_path[1]}/{contract_name}.json"
 
-    class_hash = get_hash(contract_name)
+    class_hash = get_account_hash(contract_name)
 
     tx = DeployAccount(
         class_hash=class_hash,
@@ -97,13 +97,14 @@ async def deploy_account(
     )
 
     response = await get_gateway_response(network, tx, mainnet_token)
+
     address = response["address"]
-    tx_hash = response["tx_hash"]
+    tx_hash = response["transaction_hash"]
 
     logging.info(
         f"⏳ ️Deployment of {contract_name} successfully sent at {hex_address(address)}"
     )
-    logging.info(f"🧾 Transaction hash: {hex(tx_hash)}")
+    logging.info(f"🧾 Transaction hash: {tx_hash}")
 
     deployments.register(address, register_abi, network, alias)
 
diff --git a/tests/commands/test_account.py b/tests/commands/test_account.py
index 520d4c27..37b3e07f 100644
--- a/tests/commands/test_account.py
+++ b/tests/commands/test_account.py
@@ -20,7 +20,7 @@
 MAX_FEE = 10
 SALT = 444
 SIGNATURE = [111, 222]
-CLASS_HASH = 12345
+CLASS_HASH = "0x12345"
 
 
 @pytest.fixture(autouse=True)
@@ -53,7 +53,7 @@ async def test_account_init_bad_key(caplog):
 
 @pytest.mark.asyncio
 @patch("nile.core.account.deploy_account", return_value=(1, 2))
-@patch("nile.core.account.get_hash", return_value=CLASS_HASH)
+@patch("nile.common.get_hash", return_value=CLASS_HASH)
 @patch("nile.core.account.Signer.sign_deployment", return_value=SIGNATURE)
 @patch("nile.core.account.os.path.dirname")
 async def test_deploy(mock_path, mock_signer, mock_hash, mock_deploy):

From 18d1b1fb26ff8ecb3aebbfe0093d2b3c5ee8c1f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Triay?= <martriay@gmail.com>
Date: Fri, 18 Nov 2022 01:59:46 -0300
Subject: [PATCH 090/109] fix linting

---
 src/nile/cli.py          | 10 ++++++----
 src/nile/common.py       |  2 ++
 src/nile/core/account.py | 15 ++++++++-------
 src/nile/nre.py          |  9 ++++++---
 4 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/nile/cli.py b/src/nile/cli.py
index 85a25ca8..83203cc7 100644
--- a/src/nile/cli.py
+++ b/src/nile/cli.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 """Nile CLI entry point."""
 import logging
-
 import os
+
 import asyncclick as click
 
 from nile.common import is_alias
@@ -17,14 +17,14 @@
 from nile.core.run import run as run_command
 from nile.core.test import test as test_command
 from nile.core.version import version as version_command
-from nile.utils import normalize_number, hex_address
+from nile.signer import Signer
+from nile.utils import hex_address, normalize_number
 from nile.utils.get_accounts import get_accounts as get_accounts_command
 from nile.utils.get_accounts import (
     get_predeployed_accounts as get_predeployed_accounts_command,
 )
 from nile.utils.get_nonce import get_nonce as get_nonce_command
 from nile.utils.status import status as status_command
-from nile.signer import Signer
 
 logging.basicConfig(level=logging.DEBUG, format="%(message)s")
 logging.getLogger("asyncio").setLevel(logging.WARNING)
@@ -162,7 +162,9 @@ async def setup(signer, network, salt, max_fee, watch_mode):
 async def conterfactual_address(signer, salt):
     """Precompute the address of an Account contract."""
     _signer = Signer(normalize_number(os.environ[signer]))
-    address = hex_address(get_counterfactual_address(salt, calldata=[_signer.public_key]))
+    address = hex_address(
+        get_counterfactual_address(salt, calldata=[_signer.public_key])
+    )
     logging.info(address)
 
 
diff --git a/src/nile/common.py b/src/nile/common.py
index cd2c3831..c089c907 100644
--- a/src/nile/common.py
+++ b/src/nile/common.py
@@ -136,12 +136,14 @@ def get_hash(contract_name, overriding_path=None):
         compute_class_hash(contract_class=contract_class, hash_func=pedersen_hash)
     )
 
+
 def get_account_hash(contract="Account"):
     """Return the class_hash of an Account contract."""
     pt = os.path.dirname(os.path.realpath(__file__)).replace("/core", "")
     overriding_path = (f"{pt}/artifacts", f"{pt}/artifacts/abis")
     return int(get_hash(contract, overriding_path=overriding_path), 16)
 
+
 def get_addresses_from_string(string):
     """Return a set of integers with identified addresses in a string."""
     return set(
diff --git a/src/nile/core/account.py b/src/nile/core/account.py
index 6c132cc7..bab21deb 100644
--- a/src/nile/core/account.py
+++ b/src/nile/core/account.py
@@ -12,9 +12,8 @@
     QUERY_VERSION,
     TRANSACTION_VERSION,
     UNIVERSAL_DEPLOYER_ADDRESS,
-    get_contract_class,
-    get_hash,
     get_account_hash,
+    get_contract_class,
     is_alias,
     normalize_number,
 )
@@ -251,10 +250,9 @@ def _get_target_address(self, address_or_alias):
         if not is_alias(address_or_alias):
             address_or_alias = normalize_number(address_or_alias)
 
-        target_address, _ = (
-            next(deployments.load(address_or_alias, self.network), None)
-            or (address_or_alias, None)
-        )
+        target_address, _ = next(
+            deployments.load(address_or_alias, self.network), None
+        ) or (address_or_alias, None)
 
         return target_address
 
@@ -269,9 +267,12 @@ async def _process_arguments(self, max_fee, nonce, calldata=None):
 
         return max_fee, nonce, calldata
 
-def get_counterfactual_address(salt=None, calldata=[], contract="Account"):
+
+def get_counterfactual_address(salt=None, calldata=None, contract="Account"):
+    """Precompute a contract's address for a given class, salt, and calldata."""
     class_hash = get_account_hash(contract)
     salt = 0 if salt is None else int(salt)
+    salt = [] if calldata is None else calldata
     return calculate_contract_address_from_hash(
         salt=salt,
         class_hash=class_hash,
diff --git a/src/nile/nre.py b/src/nile/nre.py
index 8196c1fb..c8258c7f 100644
--- a/src/nile/nre.py
+++ b/src/nile/nre.py
@@ -1,12 +1,12 @@
 """nile runtime environment."""
 from nile import deployments
-from nile.common import is_alias, ETH_ADDRESS, ETH_ABI
+from nile.common import ETH_ABI, ETH_ADDRESS, is_alias
 from nile.core.account import Account
 from nile.core.call_or_invoke import call_or_invoke
 from nile.core.compile import compile
 from nile.core.deploy import deploy
 from nile.core.plugins import get_installed_plugins, skip_click_exit
-from nile.utils import normalize_number, from_uint
+from nile.utils import from_uint, normalize_number
 from nile.utils.get_accounts import get_accounts, get_predeployed_accounts
 from nile.utils.get_nonce import get_nonce
 
@@ -50,7 +50,9 @@ def call(self, address_or_alias, method, params=None, abi=None):
         """Call a view function in a smart contract."""
         if not is_alias(address_or_alias):
             address_or_alias = normalize_number(address_or_alias)
-        return call_or_invoke(address_or_alias, "call", method, params, self.network, abi=abi)
+        return call_or_invoke(
+            address_or_alias, "call", method, params, self.network, abi=abi
+        )
 
     def get_deployment(self, address_or_alias):
         """Get a deployment by its identifier (address or alias)."""
@@ -80,6 +82,7 @@ def get_nonce(self, contract_address):
         return get_nonce(contract_address, self.network)
 
     async def get_balance(self, account):
+        """Get the Ether balance of an address."""
         output = await self.call(ETH_ADDRESS, "balanceOf", [account], abi=ETH_ABI)
         low, high = output.split()
         res = from_uint([int(low, 16), int(high, 16)])

From be74fc812a7588fe05f8dd942052b194040504b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Triay?= <martriay@gmail.com>
Date: Fri, 18 Nov 2022 02:22:10 -0300
Subject: [PATCH 091/109] fix tests

---
 src/nile/core/account.py       |  2 +-
 tests/commands/test_account.py | 20 ++++++++++----------
 tests/commands/test_deploy.py  |  6 +++---
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/nile/core/account.py b/src/nile/core/account.py
index bab21deb..de530808 100644
--- a/src/nile/core/account.py
+++ b/src/nile/core/account.py
@@ -272,7 +272,7 @@ def get_counterfactual_address(salt=None, calldata=None, contract="Account"):
     """Precompute a contract's address for a given class, salt, and calldata."""
     class_hash = get_account_hash(contract)
     salt = 0 if salt is None else int(salt)
-    salt = [] if calldata is None else calldata
+    calldata = [] if calldata is None else calldata
     return calculate_contract_address_from_hash(
         salt=salt,
         class_hash=class_hash,
diff --git a/tests/commands/test_account.py b/tests/commands/test_account.py
index 37b3e07f..1c438f01 100644
--- a/tests/commands/test_account.py
+++ b/tests/commands/test_account.py
@@ -20,7 +20,7 @@
 MAX_FEE = 10
 SALT = 444
 SIGNATURE = [111, 222]
-CLASS_HASH = "0x12345"
+CLASS_HASH = 12345
 
 
 @pytest.fixture(autouse=True)
@@ -53,7 +53,7 @@ async def test_account_init_bad_key(caplog):
 
 @pytest.mark.asyncio
 @patch("nile.core.account.deploy_account", return_value=(1, 2))
-@patch("nile.common.get_hash", return_value=CLASS_HASH)
+@patch("nile.common.get_hash", return_value=hex(CLASS_HASH))
 @patch("nile.core.account.Signer.sign_deployment", return_value=SIGNATURE)
 @patch("nile.core.account.os.path.dirname")
 async def test_deploy(mock_path, mock_signer, mock_hash, mock_deploy):
@@ -82,7 +82,7 @@ async def test_deploy(mock_path, mock_signer, mock_hash, mock_deploy):
 
 @pytest.mark.asyncio
 @patch("nile.core.account.deploy_account", return_value=(MOCK_ADDRESS, MOCK_INDEX))
-@patch("nile.core.account.get_hash", return_value=CLASS_HASH)
+@patch("nile.core.account.get_account_hash", return_value=CLASS_HASH)
 @patch("nile.core.account.accounts.register")
 async def test_deploy_accounts_register(mock_register, mock_hash, mock_deploy):
     account = await Account(KEY, NETWORK)
@@ -94,7 +94,7 @@ async def test_deploy_accounts_register(mock_register, mock_hash, mock_deploy):
 
 @pytest.mark.asyncio
 @patch("nile.core.account.deploy_account", return_value=(MOCK_ADDRESS, MOCK_INDEX))
-@patch("nile.core.account.get_hash", return_value=CLASS_HASH)
+@patch("nile.core.account.get_account_hash", return_value=CLASS_HASH)
 @patch("nile.core.account.get_contract_class", return_value="ContractClass")
 @patch("nile.core.account.declare")
 async def test_declare(mock_declare, mock_get_class, mock_hash, mock_deploy):
@@ -145,7 +145,7 @@ async def test_declare(mock_declare, mock_get_class, mock_hash, mock_deploy):
 
 @pytest.mark.asyncio
 @patch("nile.core.account.deploy_account", return_value=(MOCK_ADDRESS, MOCK_INDEX))
-@patch("nile.core.account.get_hash", return_value=CLASS_HASH)
+@patch("nile.core.account.get_account_hash", return_value=CLASS_HASH)
 @patch("nile.core.account.get_nonce", return_value=0)
 @patch("nile.core.account.call_or_invoke")
 @patch(
@@ -167,7 +167,7 @@ async def test_send_nonce_call(
 
 @pytest.mark.asyncio
 @patch("nile.core.account.deploy_account", return_value=(MOCK_ADDRESS, MOCK_INDEX))
-@patch("nile.core.account.get_hash", return_value=CLASS_HASH)
+@patch("nile.core.account.get_account_hash", return_value=CLASS_HASH)
 @patch(
     "nile.core.account.Account._get_target_address", return_value=MOCK_TARGET_ADDRESS
 )
@@ -213,7 +213,7 @@ async def test_send_sign_transaction_and_execute(
 
 @pytest.mark.asyncio
 @patch("nile.core.account.deploy_account", return_value=(MOCK_ADDRESS, MOCK_INDEX))
-@patch("nile.core.account.get_hash", return_value=CLASS_HASH)
+@patch("nile.core.account.get_account_hash", return_value=CLASS_HASH)
 @patch(
     "nile.core.account.Account._get_target_address", return_value=MOCK_TARGET_ADDRESS
 )
@@ -257,7 +257,7 @@ async def test_send_defaults(
 
 @pytest.mark.asyncio
 @patch("nile.core.account.deploy_account", return_value=(MOCK_ADDRESS, MOCK_INDEX))
-@patch("nile.core.account.get_hash", return_value=CLASS_HASH)
+@patch("nile.core.account.get_account_hash", return_value=CLASS_HASH)
 async def test_estimate_fee(mock_hash, mock_deploy):
     account = await Account(KEY, NETWORK)
     # Mock send
@@ -272,7 +272,7 @@ async def test_estimate_fee(mock_hash, mock_deploy):
 
 @pytest.mark.asyncio
 @patch("nile.core.account.deploy_account", return_value=(MOCK_ADDRESS, MOCK_INDEX))
-@patch("nile.core.account.get_hash", return_value=CLASS_HASH)
+@patch("nile.core.account.get_account_hash", return_value=CLASS_HASH)
 async def test_simulate(mock_hash, mock_deploy):
     account = await Account(KEY, NETWORK)
     # Mock send
@@ -289,7 +289,7 @@ async def test_simulate(mock_hash, mock_deploy):
 @pytest.mark.parametrize("query_type", ["estimate_fee", "simulate"])
 @pytest.mark.parametrize("watch_mode", ["track", "debug"])
 @patch("nile.core.account.deploy_account", return_value=(MOCK_ADDRESS, MOCK_INDEX))
-@patch("nile.core.account.get_hash", return_value=CLASS_HASH)
+@patch("nile.core.account.get_account_hash", return_value=CLASS_HASH)
 @patch(
     "nile.core.account.Account._get_target_address", return_value=MOCK_TARGET_ADDRESS
 )
diff --git a/tests/commands/test_deploy.py b/tests/commands/test_deploy.py
index a71ff83c..18ba6c99 100644
--- a/tests/commands/test_deploy.py
+++ b/tests/commands/test_deploy.py
@@ -169,9 +169,9 @@ async def test_deploy(mock_register, mock_parse, caplog, args, cmd_args, exp_abi
 @patch("nile.core.deploy.deployments.register")
 @patch(
     "nile.core.deploy.get_gateway_response",
-    return_value={"address": ADDRESS, "tx_hash": TX_HASH},
+    return_value={"address": ADDRESS, "transaction_hash": TX_HASH},
 )
-@patch("nile.core.deploy.get_hash", return_value=CLASS_HASH)
+@patch("nile.core.deploy.get_account_hash", return_value=CLASS_HASH)
 async def test_deploy_account(
     mock_hash, mock_gateway, mock_register, caplog, args, exp_abi
 ):
@@ -190,4 +190,4 @@ async def test_deploy_account(
         f"⏳ ️Deployment of {CONTRACT} successfully sent at {hex_address(ADDRESS)}"
         in caplog.text
     )
-    assert f"🧾 Transaction hash: {hex(TX_HASH)}" in caplog.text
+    assert f"🧾 Transaction hash: {TX_HASH}" in caplog.text

From 1df21d28bfaa97b36e8e880ab5628dc6907f854a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Triay?= <martriay@gmail.com>
Date: Fri, 18 Nov 2022 02:52:39 -0300
Subject: [PATCH 092/109] add README

---
 README.md                     | 29 +++++++++++++++++++++++++++--
 src/nile/cli.py               | 12 ++++++++++++
 src/nile/nre.py               | 12 +++++-------
 src/nile/utils/get_balance.py | 13 +++++++++++++
 4 files changed, 57 insertions(+), 9 deletions(-)
 create mode 100644 src/nile/utils/get_balance.py

diff --git a/README.md b/README.md
index 2711e0c4..c90fb57d 100644
--- a/README.md
+++ b/README.md
@@ -151,7 +151,7 @@ Deploy an Account associated with a given private key.
 To avoid accidentally leaking private keys, this command takes an alias instead of the actual private key. This alias is associated with an environmental variable of the same name, whose value is the actual private key.
 
 ```sh
-nile setup <private_key_alias>
+nile setup <private_key_alias> [--salt SALT] [--max_fee MAX_FEE] [--network NETWORK]
 
 🚀 Deploying Account
 ⏳ ️Deployment of Account successfully sent at 0x07db6b52c8ab888183277bc6411c400136fe566c0eebfb96fffa559b2e60e794
@@ -161,11 +161,28 @@ nile setup <private_key_alias>
 
 A few things to note here:
 
+- This is a conterfactual deployment, meaning the deployed account pays for its own deployment. You can to use [`nile conterfactual-address`](#conterfactual-address) to predict the account address and send the necessary funds beforehand.
 - `nile setup <private_key_alias>` looks for an environment variable with the name of the private key alias.
-- This creates or updates `localhost.accounts.json` file storing all data related to accounts management.
+- This creates or updates `localhost.accounts.json` file storing all data related to account management.
 - The creates or updates `localhost.deployments.txt` file storing all data related to deployments.
 - `--track` and `--debug` flags can be used to watch the status of the account deployment transaction. See `status` below for a complete description.
 
+### `conterfactual-address`
+
+Precompute the deployment address of an Account contract, for a given signer and salt. If not provided, `salt` defaults to `0`.
+
+```sh
+nile conterfactual-address <private_key_alias> [--salt SALT]
+```
+
+For example:
+
+```sh
+nile conterfactual-address <private_key_alias> --salt 123
+
+0x00193c9bf3f66f556b40f0e95dffdd07db2cd6b10552a75048b71550049d1246
+```
+
 ### `send`
 
 Execute a transaction through the `Account` associated with the private key provided. The syntax is:
@@ -431,6 +448,14 @@ async def run(nre):
     await bob.send(...)
 ```
 
+### `get-balance`
+
+Retrieves the Ether balance for a given contract address.
+
+```sh
+nile get-balance <contract_address> [--network]
+```
+
 ### `get-nonce`
 
 Retrieves the nonce for the given contract address (usually an account).
diff --git a/src/nile/cli.py b/src/nile/cli.py
index 83203cc7..af70a3c7 100644
--- a/src/nile/cli.py
+++ b/src/nile/cli.py
@@ -23,6 +23,7 @@
 from nile.utils.get_accounts import (
     get_predeployed_accounts as get_predeployed_accounts_command,
 )
+from nile.utils.get_balance import get_balance as get_balance_command
 from nile.utils.get_nonce import get_nonce as get_nonce_command
 from nile.utils.status import status as status_command
 
@@ -352,6 +353,17 @@ async def get_accounts(network, predeployed):
         await get_predeployed_accounts_command(network)
 
 
+@cli.command()
+@click.argument("contract_address")
+@network_option
+async def get_balance(contract_address, network):
+    """Retrieve the Ether balance for a given contract."""
+    balance = await get_balance_command(
+        normalize_number(contract_address), network=network
+    )
+    logging.info(f"💰 {contract_address} Ether balance is: {balance}")
+
+
 @cli.command()
 @click.argument("contract_address")
 @network_option
diff --git a/src/nile/nre.py b/src/nile/nre.py
index c8258c7f..66b05946 100644
--- a/src/nile/nre.py
+++ b/src/nile/nre.py
@@ -1,13 +1,14 @@
 """nile runtime environment."""
 from nile import deployments
-from nile.common import ETH_ABI, ETH_ADDRESS, is_alias
+from nile.common import is_alias
 from nile.core.account import Account
 from nile.core.call_or_invoke import call_or_invoke
 from nile.core.compile import compile
 from nile.core.deploy import deploy
 from nile.core.plugins import get_installed_plugins, skip_click_exit
-from nile.utils import from_uint, normalize_number
+from nile.utils import normalize_number
 from nile.utils.get_accounts import get_accounts, get_predeployed_accounts
+from nile.utils.get_balance import get_balance
 from nile.utils.get_nonce import get_nonce
 
 
@@ -81,9 +82,6 @@ def get_nonce(self, contract_address):
         """Retrieve the nonce for a contract."""
         return get_nonce(contract_address, self.network)
 
-    async def get_balance(self, account):
+    def get_balance(self, account):
         """Get the Ether balance of an address."""
-        output = await self.call(ETH_ADDRESS, "balanceOf", [account], abi=ETH_ABI)
-        low, high = output.split()
-        res = from_uint([int(low, 16), int(high, 16)])
-        return res
+        return get_balance(account, self.network)
diff --git a/src/nile/utils/get_balance.py b/src/nile/utils/get_balance.py
new file mode 100644
index 00000000..027b2809
--- /dev/null
+++ b/src/nile/utils/get_balance.py
@@ -0,0 +1,13 @@
+"""Retrieve the Ether balance for a given address."""
+from nile.common import ETH_ABI, ETH_ADDRESS
+from nile.core.call_or_invoke import call_or_invoke
+from nile.utils import from_uint
+
+
+async def get_balance(account, network):
+    """Get the Ether balance of an address."""
+    output = await call_or_invoke(
+        ETH_ADDRESS, "call", "balanceOf", [account], abi=ETH_ABI, network=network
+    )
+    low, high = output.split()
+    return from_uint([int(low, 16), int(high, 16)])

From 8df1330a5179b6994c250bd548c48b357b107e9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Triay?= <martriay@gmail.com>
Date: Fri, 18 Nov 2022 02:57:53 -0300
Subject: [PATCH 093/109] fix typo

---
 README.md       | 8 ++++----
 src/nile/cli.py | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index c90fb57d..b18763d2 100644
--- a/README.md
+++ b/README.md
@@ -161,24 +161,24 @@ nile setup <private_key_alias> [--salt SALT] [--max_fee MAX_FEE] [--network NETW
 
 A few things to note here:
 
-- This is a conterfactual deployment, meaning the deployed account pays for its own deployment. You can to use [`nile conterfactual-address`](#conterfactual-address) to predict the account address and send the necessary funds beforehand.
+- This is a counterfactual deployment, meaning the deployed account pays for its own deployment. You can use [`nile counterfactual-address`](#counterfactual-address) to predict the account address and send the necessary funds beforehand.
 - `nile setup <private_key_alias>` looks for an environment variable with the name of the private key alias.
 - This creates or updates `localhost.accounts.json` file storing all data related to account management.
 - The creates or updates `localhost.deployments.txt` file storing all data related to deployments.
 - `--track` and `--debug` flags can be used to watch the status of the account deployment transaction. See `status` below for a complete description.
 
-### `conterfactual-address`
+### `counterfactual-address`
 
 Precompute the deployment address of an Account contract, for a given signer and salt. If not provided, `salt` defaults to `0`.
 
 ```sh
-nile conterfactual-address <private_key_alias> [--salt SALT]
+nile counterfactual-address <private_key_alias> [--salt SALT]
 ```
 
 For example:
 
 ```sh
-nile conterfactual-address <private_key_alias> --salt 123
+nile counterfactual-address <private_key_alias> --salt 123
 
 0x00193c9bf3f66f556b40f0e95dffdd07db2cd6b10552a75048b71550049d1246
 ```
diff --git a/src/nile/cli.py b/src/nile/cli.py
index af70a3c7..d3d0e40b 100644
--- a/src/nile/cli.py
+++ b/src/nile/cli.py
@@ -160,7 +160,7 @@ async def setup(signer, network, salt, max_fee, watch_mode):
 @cli.command()
 @click.argument("signer", nargs=1)
 @click.option("--salt", nargs=1, default=None)
-async def conterfactual_address(signer, salt):
+async def counterfactual_address(signer, salt):
     """Precompute the address of an Account contract."""
     _signer = Signer(normalize_number(os.environ[signer]))
     address = hex_address(

From a118fc7f8a226bf1d730ddc5f679cdcda65647e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Triay?= <martriay@gmail.com>
Date: Fri, 18 Nov 2022 16:19:35 +0100
Subject: [PATCH 094/109] Update README.md

Co-authored-by: Eric Nordelo <eric.nordelo39@gmail.com>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b18763d2..a0973de6 100644
--- a/README.md
+++ b/README.md
@@ -453,7 +453,7 @@ async def run(nre):
 Retrieves the Ether balance for a given contract address.
 
 ```sh
-nile get-balance <contract_address> [--network]
+nile get-balance <contract_address> [--network NETWORK]
 ```
 
 ### `get-nonce`

From 6a914a1df61601c712d50befec8c8131cf0f667c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Triay?= <martriay@gmail.com>
Date: Fri, 18 Nov 2022 21:08:59 +0100
Subject: [PATCH 095/109] Update src/nile/signer.py

Co-authored-by: Andrew Fleming <fleming-andrew@protonmail.com>
---
 src/nile/signer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/nile/signer.py b/src/nile/signer.py
index 1be0d913..3c320ab5 100644
--- a/src/nile/signer.py
+++ b/src/nile/signer.py
@@ -139,7 +139,7 @@ def get_declare_hash(sender, contract_class, max_fee, nonce, chain_id):
 def get_deploy_account_hash(
     contract_address, class_hash, calldata, salt, max_fee, nonce, chain_id
 ):
-    """Compute the hash of a declare transaction."""
+    """Compute the hash of an account deployment transaction."""
     return calculate_deploy_account_transaction_hash(
         version=TRANSACTION_VERSION,
         contract_address=contract_address,

From c165eb716d12adfd44b2ab539f70c4b9317b751d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Triay?= <martriay@gmail.com>
Date: Fri, 18 Nov 2022 17:41:16 -0300
Subject: [PATCH 096/109] apply review comments

---
 setup.cfg                      |  2 +-
 src/nile/cli.py                |  2 +-
 src/nile/common.py             | 14 ++++++--------
 src/nile/core/account.py       |  8 ++++----
 src/nile/core/deploy.py        |  4 ++--
 src/nile/utils/get_balance.py  |  4 ++--
 tests/commands/test_account.py | 18 +++++++++---------
 tests/commands/test_deploy.py  |  2 +-
 8 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 874af4a9..5f0aa379 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -29,7 +29,7 @@ install_requires =
     importlib-metadata>=4.0
     python-dotenv>=0.19.2
     starknet-devnet>=0.3.5
-    cairo-lang==0.10.1
+    cairo-lang>=0.10.1
     pytest>=7.1.3
     pytest-asyncio>=0.19.0
     requests>=2.28.1
diff --git a/src/nile/cli.py b/src/nile/cli.py
index d3d0e40b..bd7a3ac1 100644
--- a/src/nile/cli.py
+++ b/src/nile/cli.py
@@ -160,7 +160,7 @@ async def setup(signer, network, salt, max_fee, watch_mode):
 @cli.command()
 @click.argument("signer", nargs=1)
 @click.option("--salt", nargs=1, default=None)
-async def counterfactual_address(signer, salt):
+def counterfactual_address(signer, salt):
     """Precompute the address of an Account contract."""
     _signer = Signer(normalize_number(os.environ[signer]))
     address = hex_address(
diff --git a/src/nile/common.py b/src/nile/common.py
index c089c907..8342fbe2 100644
--- a/src/nile/common.py
+++ b/src/nile/common.py
@@ -22,8 +22,8 @@
 TRANSACTION_VERSION = 1
 QUERY_VERSION_BASE = 2**128
 QUERY_VERSION = QUERY_VERSION_BASE + TRANSACTION_VERSION
-ETH_ABI = f"{pt}/artifacts/abis/ERC20.json"
-ETH_ADDRESS = "0x49D36570D4E46F48E99674BD3FCC84644DDD6B96F7C741B1562B82F9E004DC7"
+ETH_TOKEN_ABI = f"{pt}/artifacts/abis/ERC20.json"
+ETH_TOKEN_ADDRESS = "0x49D36570D4E46F48E99674BD3FCC84644DDD6B96F7C741B1562B82F9E004DC7"
 UNIVERSAL_DEPLOYER_ADDRESS = (
     # subject to change
     "0x041a78e741e5af2fec34b695679bc6891742439f7afb8484ecd7766661ad02bf"
@@ -129,19 +129,17 @@ def get_contract_class(contract_name, overriding_path=None):
     return contract_class
 
 
-def get_hash(contract_name, overriding_path=None):
+def get_class_hash(contract_name, overriding_path=None):
     """Return the class_hash for a given contract name."""
     contract_class = get_contract_class(contract_name, overriding_path)
-    return hex_class_hash(
-        compute_class_hash(contract_class=contract_class, hash_func=pedersen_hash)
-    )
+    return compute_class_hash(contract_class=contract_class, hash_func=pedersen_hash)
 
 
-def get_account_hash(contract="Account"):
+def get_account_class_hash(contract="Account"):
     """Return the class_hash of an Account contract."""
     pt = os.path.dirname(os.path.realpath(__file__)).replace("/core", "")
     overriding_path = (f"{pt}/artifacts", f"{pt}/artifacts/abis")
-    return int(get_hash(contract, overriding_path=overriding_path), 16)
+    return get_class_hash(contract, overriding_path=overriding_path)
 
 
 def get_addresses_from_string(string):
diff --git a/src/nile/core/account.py b/src/nile/core/account.py
index de530808..f4e77b26 100644
--- a/src/nile/core/account.py
+++ b/src/nile/core/account.py
@@ -12,7 +12,7 @@
     QUERY_VERSION,
     TRANSACTION_VERSION,
     UNIVERSAL_DEPLOYER_ADDRESS,
-    get_account_hash,
+    get_account_class_hash,
     get_contract_class,
     is_alias,
     normalize_number,
@@ -98,13 +98,13 @@ async def __init__(
                 self.address = address
                 self.index = index
 
-    async def deploy(self, salt=0, max_fee=None, query_type=None, watch_mode=None):
+    async def deploy(self, salt=None, max_fee=None, query_type=None, watch_mode=None):
         """Deploy an Account contract for the given private key."""
         index = accounts.current_index(self.network)
         pt = os.path.dirname(os.path.realpath(__file__)).replace("/core", "")
         overriding_path = (f"{pt}/artifacts", f"{pt}/artifacts/abis")
 
-        class_hash = get_account_hash("Account")
+        class_hash = get_account_class_hash("Account")
         salt = 0 if salt is None else normalize_number(salt)
         max_fee = 0 if max_fee is None else normalize_number(max_fee)
         calldata = [self.signer.public_key]
@@ -270,7 +270,7 @@ async def _process_arguments(self, max_fee, nonce, calldata=None):
 
 def get_counterfactual_address(salt=None, calldata=None, contract="Account"):
     """Precompute a contract's address for a given class, salt, and calldata."""
-    class_hash = get_account_hash(contract)
+    class_hash = get_account_class_hash(contract)
     salt = 0 if salt is None else int(salt)
     calldata = [] if calldata is None else calldata
     return calculate_contract_address_from_hash(
diff --git a/src/nile/core/deploy.py b/src/nile/core/deploy.py
index f69adde9..2bd2de9c 100644
--- a/src/nile/core/deploy.py
+++ b/src/nile/core/deploy.py
@@ -9,7 +9,7 @@
     BUILD_DIRECTORY,
     QUERY_VERSION,
     TRANSACTION_VERSION,
-    get_account_hash,
+    get_account_class_hash,
     parse_information,
 )
 from nile.starknet_cli import execute_call, get_gateway_response
@@ -84,7 +84,7 @@ async def deploy_account(
     )
     register_abi = abi if abi is not None else f"{base_path[1]}/{contract_name}.json"
 
-    class_hash = get_account_hash(contract_name)
+    class_hash = get_account_class_hash(contract_name)
 
     tx = DeployAccount(
         class_hash=class_hash,
diff --git a/src/nile/utils/get_balance.py b/src/nile/utils/get_balance.py
index 027b2809..facaa399 100644
--- a/src/nile/utils/get_balance.py
+++ b/src/nile/utils/get_balance.py
@@ -1,5 +1,5 @@
 """Retrieve the Ether balance for a given address."""
-from nile.common import ETH_ABI, ETH_ADDRESS
+from nile.common import ETH_TOKEN_ABI, ETH_TOKEN_ADDRESS
 from nile.core.call_or_invoke import call_or_invoke
 from nile.utils import from_uint
 
@@ -7,7 +7,7 @@
 async def get_balance(account, network):
     """Get the Ether balance of an address."""
     output = await call_or_invoke(
-        ETH_ADDRESS, "call", "balanceOf", [account], abi=ETH_ABI, network=network
+        ETH_TOKEN_ADDRESS, "call", "balanceOf", [account], abi=ETH_TOKEN_ABI, network=network
     )
     low, high = output.split()
     return from_uint([int(low, 16), int(high, 16)])
diff --git a/tests/commands/test_account.py b/tests/commands/test_account.py
index 1c438f01..fb79cf47 100644
--- a/tests/commands/test_account.py
+++ b/tests/commands/test_account.py
@@ -53,7 +53,7 @@ async def test_account_init_bad_key(caplog):
 
 @pytest.mark.asyncio
 @patch("nile.core.account.deploy_account", return_value=(1, 2))
-@patch("nile.common.get_hash", return_value=hex(CLASS_HASH))
+@patch("nile.common.get_class_hash", return_value=CLASS_HASH)
 @patch("nile.core.account.Signer.sign_deployment", return_value=SIGNATURE)
 @patch("nile.core.account.os.path.dirname")
 async def test_deploy(mock_path, mock_signer, mock_hash, mock_deploy):
@@ -82,7 +82,7 @@ async def test_deploy(mock_path, mock_signer, mock_hash, mock_deploy):
 
 @pytest.mark.asyncio
 @patch("nile.core.account.deploy_account", return_value=(MOCK_ADDRESS, MOCK_INDEX))
-@patch("nile.core.account.get_account_hash", return_value=CLASS_HASH)
+@patch("nile.core.account.get_account_class_hash", return_value=CLASS_HASH)
 @patch("nile.core.account.accounts.register")
 async def test_deploy_accounts_register(mock_register, mock_hash, mock_deploy):
     account = await Account(KEY, NETWORK)
@@ -94,7 +94,7 @@ async def test_deploy_accounts_register(mock_register, mock_hash, mock_deploy):
 
 @pytest.mark.asyncio
 @patch("nile.core.account.deploy_account", return_value=(MOCK_ADDRESS, MOCK_INDEX))
-@patch("nile.core.account.get_account_hash", return_value=CLASS_HASH)
+@patch("nile.core.account.get_account_class_hash", return_value=CLASS_HASH)
 @patch("nile.core.account.get_contract_class", return_value="ContractClass")
 @patch("nile.core.account.declare")
 async def test_declare(mock_declare, mock_get_class, mock_hash, mock_deploy):
@@ -145,7 +145,7 @@ async def test_declare(mock_declare, mock_get_class, mock_hash, mock_deploy):
 
 @pytest.mark.asyncio
 @patch("nile.core.account.deploy_account", return_value=(MOCK_ADDRESS, MOCK_INDEX))
-@patch("nile.core.account.get_account_hash", return_value=CLASS_HASH)
+@patch("nile.core.account.get_account_class_hash", return_value=CLASS_HASH)
 @patch("nile.core.account.get_nonce", return_value=0)
 @patch("nile.core.account.call_or_invoke")
 @patch(
@@ -167,7 +167,7 @@ async def test_send_nonce_call(
 
 @pytest.mark.asyncio
 @patch("nile.core.account.deploy_account", return_value=(MOCK_ADDRESS, MOCK_INDEX))
-@patch("nile.core.account.get_account_hash", return_value=CLASS_HASH)
+@patch("nile.core.account.get_account_class_hash", return_value=CLASS_HASH)
 @patch(
     "nile.core.account.Account._get_target_address", return_value=MOCK_TARGET_ADDRESS
 )
@@ -213,7 +213,7 @@ async def test_send_sign_transaction_and_execute(
 
 @pytest.mark.asyncio
 @patch("nile.core.account.deploy_account", return_value=(MOCK_ADDRESS, MOCK_INDEX))
-@patch("nile.core.account.get_account_hash", return_value=CLASS_HASH)
+@patch("nile.core.account.get_account_class_hash", return_value=CLASS_HASH)
 @patch(
     "nile.core.account.Account._get_target_address", return_value=MOCK_TARGET_ADDRESS
 )
@@ -257,7 +257,7 @@ async def test_send_defaults(
 
 @pytest.mark.asyncio
 @patch("nile.core.account.deploy_account", return_value=(MOCK_ADDRESS, MOCK_INDEX))
-@patch("nile.core.account.get_account_hash", return_value=CLASS_HASH)
+@patch("nile.core.account.get_account_class_hash", return_value=CLASS_HASH)
 async def test_estimate_fee(mock_hash, mock_deploy):
     account = await Account(KEY, NETWORK)
     # Mock send
@@ -272,7 +272,7 @@ async def test_estimate_fee(mock_hash, mock_deploy):
 
 @pytest.mark.asyncio
 @patch("nile.core.account.deploy_account", return_value=(MOCK_ADDRESS, MOCK_INDEX))
-@patch("nile.core.account.get_account_hash", return_value=CLASS_HASH)
+@patch("nile.core.account.get_account_class_hash", return_value=CLASS_HASH)
 async def test_simulate(mock_hash, mock_deploy):
     account = await Account(KEY, NETWORK)
     # Mock send
@@ -289,7 +289,7 @@ async def test_simulate(mock_hash, mock_deploy):
 @pytest.mark.parametrize("query_type", ["estimate_fee", "simulate"])
 @pytest.mark.parametrize("watch_mode", ["track", "debug"])
 @patch("nile.core.account.deploy_account", return_value=(MOCK_ADDRESS, MOCK_INDEX))
-@patch("nile.core.account.get_account_hash", return_value=CLASS_HASH)
+@patch("nile.core.account.get_account_class_hash", return_value=CLASS_HASH)
 @patch(
     "nile.core.account.Account._get_target_address", return_value=MOCK_TARGET_ADDRESS
 )
diff --git a/tests/commands/test_deploy.py b/tests/commands/test_deploy.py
index 18ba6c99..ea9ba2b0 100644
--- a/tests/commands/test_deploy.py
+++ b/tests/commands/test_deploy.py
@@ -171,7 +171,7 @@ async def test_deploy(mock_register, mock_parse, caplog, args, cmd_args, exp_abi
     "nile.core.deploy.get_gateway_response",
     return_value={"address": ADDRESS, "transaction_hash": TX_HASH},
 )
-@patch("nile.core.deploy.get_account_hash", return_value=CLASS_HASH)
+@patch("nile.core.deploy.get_account_class_hash", return_value=CLASS_HASH)
 async def test_deploy_account(
     mock_hash, mock_gateway, mock_register, caplog, args, exp_abi
 ):

From dac6673e74f7094e1693f50dad5d90ca6004b509 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Triay?= <martriay@gmail.com>
Date: Fri, 18 Nov 2022 17:41:43 -0300
Subject: [PATCH 097/109] fix linting

---
 src/nile/utils/get_balance.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/nile/utils/get_balance.py b/src/nile/utils/get_balance.py
index facaa399..7816f687 100644
--- a/src/nile/utils/get_balance.py
+++ b/src/nile/utils/get_balance.py
@@ -7,7 +7,12 @@
 async def get_balance(account, network):
     """Get the Ether balance of an address."""
     output = await call_or_invoke(
-        ETH_TOKEN_ADDRESS, "call", "balanceOf", [account], abi=ETH_TOKEN_ABI, network=network
+        ETH_TOKEN_ADDRESS,
+        "call",
+        "balanceOf",
+        [account],
+        abi=ETH_TOKEN_ABI,
+        network=network,
     )
     low, high = output.split()
     return from_uint([int(low, 16), int(high, 16)])

From e4116c27dc9e9f410cd5ebf2e26d183594eef901 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Triay?= <martriay@gmail.com>
Date: Fri, 18 Nov 2022 17:41:58 -0300
Subject: [PATCH 098/109] fix linting

---
 src/nile/common.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/nile/common.py b/src/nile/common.py
index 8342fbe2..1d7dd480 100644
--- a/src/nile/common.py
+++ b/src/nile/common.py
@@ -7,7 +7,7 @@
 from starkware.starknet.core.os.class_hash import compute_class_hash
 from starkware.starknet.services.api.contract_class import ContractClass
 
-from nile.utils import hex_class_hash, normalize_number, str_to_felt
+from nile.utils import normalize_number, str_to_felt
 
 pt = os.path.dirname(os.path.realpath(__file__)).replace("/core", "")
 CONTRACTS_DIRECTORY = "contracts"

From 9358d8c8b60c16af4bf08fac28615927482bd203 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Triay?= <martriay@gmail.com>
Date: Fri, 18 Nov 2022 17:45:24 -0300
Subject: [PATCH 099/109] fix linting

---
 src/nile/utils/status.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/nile/utils/status.py b/src/nile/utils/status.py
index 6b90f837..48e4d3c0 100644
--- a/src/nile/utils/status.py
+++ b/src/nile/utils/status.py
@@ -6,8 +6,9 @@
 from collections import namedtuple
 from enum import Enum
 
-from nile.common import RETRY_AFTER_SECONDS, hex_class_hash
+from nile.common import RETRY_AFTER_SECONDS
 from nile.starknet_cli import execute_call
+from nile.utils import hex_class_hash
 from nile.utils.debug import debug_message
 
 TransactionStatus = namedtuple(

From 593fab81a56309162819f44aaff3c58467e430bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Triay?= <martriay@gmail.com>
Date: Fri, 18 Nov 2022 19:02:33 -0300
Subject: [PATCH 100/109] test get_balance, fix circular depedency

---
 src/nile/core/account.py           |  3 ++-
 src/nile/core/call_or_invoke.py    | 13 +++++-------
 src/nile/utils/get_balance.py      |  4 ++--
 tests/commands/test_get_balance.py | 34 ++++++++++++++++++++++++++++++
 4 files changed, 43 insertions(+), 11 deletions(-)
 create mode 100644 tests/commands/test_get_balance.py

diff --git a/src/nile/core/account.py b/src/nile/core/account.py
index f4e77b26..322356c9 100644
--- a/src/nile/core/account.py
+++ b/src/nile/core/account.py
@@ -223,9 +223,10 @@ async def send(
         )
 
         return await call_or_invoke(
-            contract=self,
+            contract=self.address,
             type="invoke",
             method="__execute__",
+            abi=self.abi_path,
             params=calldata,
             network=self.network,
             signature=[sig_r, sig_s],
diff --git a/src/nile/core/call_or_invoke.py b/src/nile/core/call_or_invoke.py
index e563b392..a40e380b 100644
--- a/src/nile/core/call_or_invoke.py
+++ b/src/nile/core/call_or_invoke.py
@@ -3,10 +3,10 @@
 import re
 
 from nile import deployments
-from nile.core import account
-from nile.starknet_cli import execute_call
-from nile.utils import hex_address, normalize_number
+from nile.common import is_alias
 from nile.utils.status import status
+from nile.utils import hex_address, normalize_number
+from nile.starknet_cli import execute_call
 
 
 async def call_or_invoke(
@@ -24,7 +24,7 @@ async def call_or_invoke(
     """
     Call or invoke functions of StarkNet smart contracts.
 
-    @param contract: can be an address, an alias, or an Account instance.
+    @param contract: can be an address or an alias.
     @param type: can be either call or invoke.
     @param method: the targeted function.
     @param params: the targeted function arguments.
@@ -34,10 +34,7 @@ async def call_or_invoke(
     @param query_flag: either simulate or estimate_fee.
     @param watch_mode: either track or debug.
     """
-    if isinstance(contract, account.Account):
-        address = contract.address
-        abi = contract.abi_path
-    elif abi is None:
+    if abi is None or is_alias(contract):
         address, abi = next(deployments.load(contract, network))
     else:
         address = contract
diff --git a/src/nile/utils/get_balance.py b/src/nile/utils/get_balance.py
index 7816f687..54d757c7 100644
--- a/src/nile/utils/get_balance.py
+++ b/src/nile/utils/get_balance.py
@@ -14,5 +14,5 @@ async def get_balance(account, network):
         abi=ETH_TOKEN_ABI,
         network=network,
     )
-    low, high = output.split()
-    return from_uint([int(low, 16), int(high, 16)])
+    low, high = [int(felt) for felt in output.split()]
+    return from_uint([low, high])
diff --git a/tests/commands/test_get_balance.py b/tests/commands/test_get_balance.py
new file mode 100644
index 00000000..3477355f
--- /dev/null
+++ b/tests/commands/test_get_balance.py
@@ -0,0 +1,34 @@
+"""Tests for get-nonce command."""
+from unittest.mock import patch
+
+import pytest
+
+from nile.common import ETH_TOKEN_ABI, ETH_TOKEN_ADDRESS
+from nile.utils.get_balance import get_balance
+
+NETWORKS = ["mainnet", "goerli", "goerli2", "localhost"]
+CONTRACTS = ["0x4d2", "1234", 1234]
+EXPECTED_VALUES = [
+    ("1000 0", 1000),
+    ("0 0", 0),
+    ("1234564321 5432124", 1848456012128035929902520326020686465121776865)
+]
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize("contract_address", CONTRACTS)
+@pytest.mark.parametrize("network", NETWORKS)
+@pytest.mark.parametrize("mock_return", EXPECTED_VALUES)
+async def test_get_balance(contract_address, network, mock_return):
+    with patch("nile.utils.get_balance.call_or_invoke", return_value=mock_return[0]) as mock_call:
+        res = await get_balance(contract_address, network)
+
+        mock_call.assert_called_once_with(
+            ETH_TOKEN_ADDRESS,
+            "call",
+            "balanceOf",
+            [contract_address],
+            abi=ETH_TOKEN_ABI,
+            network=network,
+        )
+
+        assert res == mock_return[1]

From b0a4f17d200c693f572a08306e8dcdeb2ed953d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Triay?= <martriay@gmail.com>
Date: Fri, 18 Nov 2022 19:04:32 -0300
Subject: [PATCH 101/109] fix linting

---
 src/nile/core/call_or_invoke.py    | 4 ++--
 tests/commands/test_get_balance.py | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/nile/core/call_or_invoke.py b/src/nile/core/call_or_invoke.py
index a40e380b..dc903e8f 100644
--- a/src/nile/core/call_or_invoke.py
+++ b/src/nile/core/call_or_invoke.py
@@ -4,9 +4,9 @@
 
 from nile import deployments
 from nile.common import is_alias
-from nile.utils.status import status
-from nile.utils import hex_address, normalize_number
 from nile.starknet_cli import execute_call
+from nile.utils import hex_address, normalize_number
+from nile.utils.status import status
 
 
 async def call_or_invoke(
diff --git a/tests/commands/test_get_balance.py b/tests/commands/test_get_balance.py
index 3477355f..38786e41 100644
--- a/tests/commands/test_get_balance.py
+++ b/tests/commands/test_get_balance.py
@@ -11,15 +11,18 @@
 EXPECTED_VALUES = [
     ("1000 0", 1000),
     ("0 0", 0),
-    ("1234564321 5432124", 1848456012128035929902520326020686465121776865)
+    ("1234564321 5432124", 1848456012128035929902520326020686465121776865),
 ]
 
+
 @pytest.mark.asyncio
 @pytest.mark.parametrize("contract_address", CONTRACTS)
 @pytest.mark.parametrize("network", NETWORKS)
 @pytest.mark.parametrize("mock_return", EXPECTED_VALUES)
 async def test_get_balance(contract_address, network, mock_return):
-    with patch("nile.utils.get_balance.call_or_invoke", return_value=mock_return[0]) as mock_call:
+    with patch(
+        "nile.utils.get_balance.call_or_invoke", return_value=mock_return[0]
+    ) as mock_call:
         res = await get_balance(contract_address, network)
 
         mock_call.assert_called_once_with(

From 7b067eef1f619cb22c8d6e513f3a1e4c14942698 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Triay?= <martriay@gmail.com>
Date: Fri, 18 Nov 2022 19:44:51 -0300
Subject: [PATCH 102/109] improve get-balance logging

---
 README.md                     |  4 ++++
 src/nile/cli.py               | 10 ++++++++--
 src/nile/utils/__init__.py    |  9 ++++++++-
 src/nile/utils/get_balance.py |  4 ++--
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index a0973de6..5f8439c9 100644
--- a/README.md
+++ b/README.md
@@ -454,6 +454,10 @@ Retrieves the Ether balance for a given contract address.
 
 ```sh
 nile get-balance <contract_address> [--network NETWORK]
+
+nile get-balance 0x053edde5384e39bad137d3c4130c708fb96ee28a4c80bf28049c486d3f36992e
+🕵️  0x053ed...6992e balance is:
+💰 4444.555501003 gwei
 ```
 
 ### `get-nonce`
diff --git a/src/nile/cli.py b/src/nile/cli.py
index bd7a3ac1..243cafb3 100644
--- a/src/nile/cli.py
+++ b/src/nile/cli.py
@@ -18,7 +18,7 @@
 from nile.core.test import test as test_command
 from nile.core.version import version as version_command
 from nile.signer import Signer
-from nile.utils import hex_address, normalize_number
+from nile.utils import hex_address, normalize_number, shorten_address
 from nile.utils.get_accounts import get_accounts as get_accounts_command
 from nile.utils.get_accounts import (
     get_predeployed_accounts as get_predeployed_accounts_command,
@@ -361,7 +361,13 @@ async def get_balance(contract_address, network):
     balance = await get_balance_command(
         normalize_number(contract_address), network=network
     )
-    logging.info(f"💰 {contract_address} Ether balance is: {balance}")
+    logging.info(f"🕵️  {shorten_address(contract_address)} balance is:")
+    if balance < 10**6:
+        logging.info(f"🪙  {balance} wei")
+    elif balance < 10**15:
+        logging.info(f"💰 {balance / 10 ** 9} gwei")
+    else:
+        logging.info(f"🤑 {balance / 10 ** 18} ether")
 
 
 @cli.command()
diff --git a/src/nile/utils/__init__.py b/src/nile/utils/__init__.py
index b4d545d8..4f4a7961 100644
--- a/src/nile/utils/__init__.py
+++ b/src/nile/utils/__init__.py
@@ -1,6 +1,6 @@
 """Utilities for Nile scripting."""
-
 import math
+import re
 from pathlib import Path
 
 try:
@@ -119,6 +119,13 @@ def assert_event_emitted(tx_exec_info, from_address, name, data):
     )
 
 
+def shorten_address(address):
+    """Shorten an address."""
+    result = re.search(r"^(0x[a-fA-F0-9]{5})[a-fA-F0-9]+([a-fA-F0-9]{5})$", address)
+    match = result.groups()
+    return f"{match[0]}...{match[1]}"
+
+
 def normalize_number(number):
     """Normalize hex or int to int."""
     if type(number) == str and number.startswith("0x"):
diff --git a/src/nile/utils/get_balance.py b/src/nile/utils/get_balance.py
index 54d757c7..0a6ace13 100644
--- a/src/nile/utils/get_balance.py
+++ b/src/nile/utils/get_balance.py
@@ -1,7 +1,7 @@
 """Retrieve the Ether balance for a given address."""
 from nile.common import ETH_TOKEN_ABI, ETH_TOKEN_ADDRESS
 from nile.core.call_or_invoke import call_or_invoke
-from nile.utils import from_uint
+from nile.utils import from_uint, normalize_number
 
 
 async def get_balance(account, network):
@@ -14,5 +14,5 @@ async def get_balance(account, network):
         abi=ETH_TOKEN_ABI,
         network=network,
     )
-    low, high = [int(felt) for felt in output.split()]
+    low, high = [normalize_number(felt) for felt in output.split()]
     return from_uint([low, high])

From 3116fdf325fe9c09e4dad51f4350a7489d5500e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Triay?= <martriay@gmail.com>
Date: Fri, 18 Nov 2022 19:51:01 -0300
Subject: [PATCH 103/109] fix tests

---
 tests/commands/test_account.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tests/commands/test_account.py b/tests/commands/test_account.py
index fb79cf47..e7770078 100644
--- a/tests/commands/test_account.py
+++ b/tests/commands/test_account.py
@@ -199,9 +199,10 @@ async def test_send_sign_transaction_and_execute(
 
         # Check values are correctly passed to '__execute__'
         mock_call.assert_called_with(
-            contract=account,
+            contract=account.address,
             max_fee=max_fee,
             method="__execute__",
+            abi=account.abi_path,
             network=NETWORK,
             params=calldata,
             signature=[sig_r, sig_s],
@@ -243,9 +244,10 @@ async def test_send_defaults(
     )
 
     mock_call.assert_called_with(
-        contract=account,
+        contract=account.address,
         max_fee=0,
         method="__execute__",
+        abi=account.abi_path,
         network=NETWORK,
         params=calldata,
         signature=[sig_r, sig_s],
@@ -333,8 +335,9 @@ async def test_execute_query(
 
     # Check query_flag is correctly passed
     mock_call.assert_called_with(
-        contract=account,
+        contract=account.address,
         max_fee=MAX_FEE,
+        abi=account.abi_path,
         method="__execute__",
         network=NETWORK,
         params=calldata,

From aab2f27ce6a35831b645760fd1ee4e3122c03e56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Triay?= <martriay@gmail.com>
Date: Fri, 18 Nov 2022 20:50:05 -0300
Subject: [PATCH 104/109] fix linting

---
 src/nile/core/account.py       |  2 +-
 src/nile/core/deploy.py        | 10 ++++++----
 tests/commands/test_account.py |  4 +++-
 tests/commands/test_deploy.py  |  3 ++-
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/nile/core/account.py b/src/nile/core/account.py
index 6892c503..de964db7 100644
--- a/src/nile/core/account.py
+++ b/src/nile/core/account.py
@@ -120,7 +120,7 @@ async def deploy(self, salt=None, max_fee=None, query_type=None, watch_mode=None
             calldata,
             salt,
             max_fee,
-            0, # nonce starts at 0
+            0,  # nonce starts at 0
         )
 
         output = await deploy_account(
diff --git a/src/nile/core/deploy.py b/src/nile/core/deploy.py
index 08d991a2..fd2cb5b6 100644
--- a/src/nile/core/deploy.py
+++ b/src/nile/core/deploy.py
@@ -1,16 +1,13 @@
 """Command to deploy StarkNet smart contracts."""
 import logging
 
-from starkware.starknet.services.api.gateway.transaction import DeployAccount
 from starkware.cairo.common.hash_chain import compute_hash_chain
 from starkware.starknet.core.os.contract_address.contract_address import (
     calculate_contract_address_from_hash,
 )
+from starkware.starknet.services.api.gateway.transaction import DeployAccount
 
 from nile import deployments
-from nile.utils import hex_address
-from nile.utils.status import status
-from nile.starknet_cli import execute_call, get_gateway_response
 from nile.common import (
     ABIS_DIRECTORY,
     BUILD_DIRECTORY,
@@ -20,6 +17,9 @@
     get_class_hash,
     parse_information,
 )
+from nile.starknet_cli import execute_call, get_gateway_response
+from nile.utils import hex_address
+from nile.utils.status import status
 
 
 async def deploy(
@@ -68,6 +68,7 @@ async def deploy(
 
     return address, register_abi
 
+
 async def deploy_contract(
     account,
     contract_name,
@@ -129,6 +130,7 @@ async def deploy_contract(
 
     return address, register_abi
 
+
 async def deploy_account(
     network,
     salt,
diff --git a/tests/commands/test_account.py b/tests/commands/test_account.py
index 3f24215c..6e62a3f7 100644
--- a/tests/commands/test_account.py
+++ b/tests/commands/test_account.py
@@ -222,7 +222,9 @@ async def test_send_nonce_call(
 @patch(
     "nile.core.account.Account._get_target_address", return_value=MOCK_TARGET_ADDRESS
 )
-async def test_send_sign_invoke_and_execute(mock_target_address, mock_hash, mock_deploy):
+async def test_send_sign_invoke_and_execute(
+    mock_target_address, mock_hash, mock_deploy
+):
     account = await Account(KEY, NETWORK)
 
     calldata = [111, 222, 333]
diff --git a/tests/commands/test_deploy.py b/tests/commands/test_deploy.py
index 39308b9a..76367981 100644
--- a/tests/commands/test_deploy.py
+++ b/tests/commands/test_deploy.py
@@ -9,7 +9,7 @@
 
 from nile.common import ABIS_DIRECTORY, BUILD_DIRECTORY
 from nile.core.account import Account
-from nile.core.deploy import deploy, deploy_account
+from nile.core.deploy import deploy, deploy_account, deploy_contract
 from nile.utils import hex_address
 
 
@@ -211,6 +211,7 @@ async def test_deploy_contract(
         )
         assert f"🧾 Transaction hash: {hex(TX_HASH)}" in caplog.text
 
+
 @pytest.mark.asyncio
 @pytest.mark.parametrize(
     "args, exp_abi",

From 9ccec7c8fc618c3af4daadaa282571421ffe8458 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Triay?= <martriay@gmail.com>
Date: Fri, 18 Nov 2022 20:53:51 -0300
Subject: [PATCH 105/109] fix tests

---
 tests/commands/test_account.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/commands/test_account.py b/tests/commands/test_account.py
index 6e62a3f7..5d54a284 100644
--- a/tests/commands/test_account.py
+++ b/tests/commands/test_account.py
@@ -149,7 +149,7 @@ async def test_declare(mock_declare, mock_get_class, mock_hash, mock_deploy):
 @pytest.mark.parametrize("deployer_address", [None, 0xDE0])
 @pytest.mark.parametrize("watch_mode", [None, "debug"])
 @pytest.mark.parametrize("abi", [None, "TEST_ABI"])
-@patch("nile.core.account.deploy", return_value=(MOCK_ADDRESS, MOCK_INDEX))
+@patch("nile.core.account.deploy_account", return_value=(MOCK_ADDRESS, MOCK_INDEX))
 @patch("nile.core.deploy.get_class_hash", return_value=0x434343)
 @patch("nile.core.account.deploy_with_deployer")
 async def test_deploy_contract(

From 800712a3c21500806be27f26508cc1b1eacd2854 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Triay?= <martriay@gmail.com>
Date: Fri, 18 Nov 2022 20:59:54 -0300
Subject: [PATCH 106/109] fix tests

---
 tests/commands/test_deploy.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/commands/test_deploy.py b/tests/commands/test_deploy.py
index 76367981..44f08377 100644
--- a/tests/commands/test_deploy.py
+++ b/tests/commands/test_deploy.py
@@ -160,7 +160,7 @@ async def test_deploy(mock_register, mock_parse, caplog, args, cmd_args, exp_abi
         ),
     ],
 )
-@patch("nile.core.account.deploy", return_value=(MOCK_ACC_ADDRESS, MOCK_ACC_INDEX))
+@patch("nile.core.account.deploy_account", return_value=(MOCK_ACC_ADDRESS, MOCK_ACC_INDEX))
 @patch("nile.core.account.Account.send", return_value=CALL_OUTPUT)
 @patch("nile.core.deploy.parse_information", return_value=[ADDRESS, TX_HASH])
 @patch("nile.core.deploy.deployments.register")

From f5f28b8b7a4803fd566cc3b77093bd3c8b38213b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Triay?= <martriay@gmail.com>
Date: Fri, 18 Nov 2022 21:01:44 -0300
Subject: [PATCH 107/109] fix linting

---
 tests/commands/test_deploy.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/commands/test_deploy.py b/tests/commands/test_deploy.py
index 44f08377..3dc5f8c6 100644
--- a/tests/commands/test_deploy.py
+++ b/tests/commands/test_deploy.py
@@ -160,7 +160,9 @@ async def test_deploy(mock_register, mock_parse, caplog, args, cmd_args, exp_abi
         ),
     ],
 )
-@patch("nile.core.account.deploy_account", return_value=(MOCK_ACC_ADDRESS, MOCK_ACC_INDEX))
+@patch(
+    "nile.core.account.deploy_account", return_value=(MOCK_ACC_ADDRESS, MOCK_ACC_INDEX)
+)
 @patch("nile.core.account.Account.send", return_value=CALL_OUTPUT)
 @patch("nile.core.deploy.parse_information", return_value=[ADDRESS, TX_HASH])
 @patch("nile.core.deploy.deployments.register")

From df92ee762f7b8b09400cf56cddf5a270fb7ce4ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Triay?= <martriay@gmail.com>
Date: Mon, 21 Nov 2022 18:53:38 -0300
Subject: [PATCH 108/109] apply review suggestions

---
 src/nile/core/account.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/nile/core/account.py b/src/nile/core/account.py
index de964db7..d5c9b63a 100644
--- a/src/nile/core/account.py
+++ b/src/nile/core/account.py
@@ -99,7 +99,9 @@ async def __init__(
                 self.address = address
                 self.index = index
 
-        assert type(self.address) == int
+        # we should replace this with static type checks
+        if hasattr(self, 'address'):
+            assert type(self.address) == int
 
     async def deploy(self, salt=None, max_fee=None, query_type=None, watch_mode=None):
         """Deploy an Account contract for the given private key."""

From 803c66ba50ec58144a2db8754f95a7839b4400f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Triay?= <martriay@gmail.com>
Date: Mon, 21 Nov 2022 18:55:42 -0300
Subject: [PATCH 109/109] fix linting

---
 src/nile/core/account.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/nile/core/account.py b/src/nile/core/account.py
index d5c9b63a..2611731c 100644
--- a/src/nile/core/account.py
+++ b/src/nile/core/account.py
@@ -100,7 +100,7 @@ async def __init__(
                 self.index = index
 
         # we should replace this with static type checks
-        if hasattr(self, 'address'):
+        if hasattr(self, "address"):
             assert type(self.address) == int
 
     async def deploy(self, salt=None, max_fee=None, query_type=None, watch_mode=None):