dev(scripts): deploy default DualVM tokens #1499

enitrat · 2024-10-11T13:44:38Z

Deploys DualVM tokens for all Starkgate addresses, mirroring the underlying starknet token.

This change is

ClementWalter · 2024-10-11T14:23:34Z

kakarot_scripts/deployment/dualvm_token_deployments.py

+# %%
+
+


Suggested change

# %%

# %%

ClementWalter · 2024-10-11T14:25:27Z

kakarot_scripts/deployment/dualvm_token_deployments.py

+    evm_deployments: Dict[str, Any],
+) -> None:
+    """
+    Deploys a new DualVMToken for a corresponding Starknet ERC20 token.


Suggested change

Deploys a new DualVMToken for a corresponding Starknet ERC20 token.

Deploy a new DualVMToken for a corresponding Starknet ERC20 token.

ClementWalter · 2024-10-11T14:26:52Z

kakarot_scripts/deployment/dualvm_token_deployments.py

+async def load_tokens(network_name: str) -> List[Dict[str, Any]]:
+    file_name = network_name.replace("starknet-", "")
+    file_path = TOKEN_ADDRESSES_DIR / f"{file_name}.json"
+    return json.loads(file_path.read_text())


Suggested change

async def load_tokens(network_name: str) -> List[Dict[str, Any]]:

file_name = network_name.replace("starknet-", "")

file_path = TOKEN_ADDRESSES_DIR / f"{file_name}.json"

return json.loads(file_path.read_text())

def load_tokens(network_name: str) -> List[Dict[str, Any]]:

file_name = network_name.replace("starknet-", "")

file_path = TOKEN_ADDRESSES_DIR / f"{file_name}.json"

return json.loads(file_path.read_text())

ClementWalter · 2024-10-11T14:28:40Z

kakarot_scripts/deployment/dualvm_token_deployments.py

+
+
+async def load_tokens(network_name: str) -> List[Dict[str, Any]]:
+    file_name = network_name.replace("starknet-", "")


useless given the fact that you renamed the networks

ClementWalter · 2024-10-11T14:31:18Z

kakarot_scripts/deployment/dualvm_token_deployments.py

+async def get_tokens(network) -> List[Dict[str, Any]]:
+    """
+    Get the list of tokens for a given network.
+    If in dev mode, will return the sepolia token list.
+    """
+    if network["type"] == NetworkType.DEV:
+        return await load_tokens("sepolia")
+    if network["name"] not in ("mainnet", "sepolia"):
+        raise ValueError(f"No known token addresses for network: {network['name']}")
+    return await load_tokens(network["name"])


Suggested change

async def get_tokens(network) -> List[Dict[str, Any]]:

"""

Get the list of tokens for a given network.

If in dev mode, will return the sepolia token list.

"""

if network["type"] == NetworkType.DEV:

return await load_tokens("sepolia")

if network["name"] not in ("mainnet", "sepolia"):

raise ValueError(f"No known token addresses for network: {network['name']}")

return await load_tokens(network["name"])

def get_tokens(network) -> List[Dict[str, Any]]:

"""

Get the list of tokens for a given network.

If in dev mode, will return the sepolia token list.

"""

if network["type"] == NetworkType.DEV:

return load_tokens("sepolia")

return load_tokens(network["name"])

the check on the existence of the list belongs to the load_tokens functions, which is responsible for loading or raising.

ClementWalter · 2024-10-11T14:32:51Z

kakarot_scripts/deployment/dualvm_token_deployments.py

+
+async def load_tokens(network_name: str) -> List[Dict[str, Any]]:
+    file_name = network_name.replace("starknet-", "")
+    file_path = TOKEN_ADDRESSES_DIR / f"{file_name}.json"


you can add a here

if not file_path.exists(): # raise ValueError # logger.error

but you can also just let the open crashes

ClementWalter · 2024-10-11T14:34:06Z

kakarot_scripts/deployment/dualvm_token_deployments.py

+
+
+async def deploy_starknet_token(owner_address: str) -> Any:
+    address = await deploy_starknet("StarknetToken", int(1e18), owner_address)


decimals should come from the token list

and we need to update the StarknetToken to accept name and symbol. Or just use the cairo zero ERC20 already in the repo as well

ClementWalter · 2024-10-11T14:40:40Z

kakarot_scripts/deployment/dualvm_token_deployments.py

+    for token in tokens:
+        token_name = token["name"]
+        if token_name not in evm_deployments:
+            await deploy_new_token(token_name, token, kakarot, evm_deployments)
+        else:
+            await verify_and_update_existing_token(
+                token_name, token, kakarot, evm_deployments
+            )


Suggested change

for token in tokens:

token_name = token["name"]

if token_name not in evm_deployments:

await deploy_new_token(token_name, token, kakarot, evm_deployments)

else:

await verify_and_update_existing_token(

token_name, token, kakarot, evm_deployments

)

for token in tokens:

token_name = token["name"]

if token_name not in evm_deployments:

await deploy_new_token(token_name, token, kakarot, evm_deployments)

else:

await verify_and_update_existing_token(

token_name, token, kakarot, evm_deployments

)

why would you need to extract token_name from token to eventually give them both to the functions?

ClementWalter · 2024-10-11T14:40:58Z

kakarot_scripts/deployment/dualvm_token_deployments.py

+    # %%
+
+
+async def get_tokens(network) -> List[Dict[str, Any]]:


Suggested change

async def get_tokens(network) -> List[Dict[str, Any]]:

async def get_tokens_list(network) -> List[Dict[str, Any]]:

ClementWalter · 2024-10-11T14:54:19Z

tests/end_to_end/CairoPrecompiles/test_dual_vm_token.py

-        "StarknetToken", int(1e18), owner.starknet_contract.address
-    )
-    return get_contract_starknet("StarknetToken", address=address)
+async def starknet_token(dual_vm_token):


scope="session"

ClementWalter · 2024-10-11T14:54:26Z

tests/end_to_end/CairoPrecompiles/test_dual_vm_token.py

-        True,
-    )
-    return dual_vm_token
+async def dual_vm_token():


scope="sessions

ClementWalter · 2024-10-11T14:54:36Z

tests/end_to_end/CairoPrecompiles/test_dual_vm_token.py

please define fixture in order

codecov · 2024-10-11T17:58:50Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 61.8%. Comparing base (9c83960) to head (f6e4fe7).

Additional details and impacted files

@@          Coverage Diff          @@
##            main   #1499   +/-   ##
=====================================
  Coverage   61.7%   61.8%           
=====================================
  Files         44      44           
  Lines       8197    8197           
=====================================
+ Hits        5060    5066    +6     
+ Misses      3137    3131    -6

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

obatirou · 2024-10-13T15:18:32Z

tests/end_to_end/conftest.py

@@ -86,6 +86,7 @@ async def _factory(amount=0):
        if balance < tx_cost:
            continue

+        breakpoint()


should not be here ?

obatirou · 2024-10-13T15:24:26Z

cairo_zero/openzeppelin/ERC20.cairo

@@ -41,6 +39,13 @@ func totalSupply{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr
    return (totalSupply=totalSupply);
 }

+@view
+func total_supply{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}() -> (


Why modifying this file ?
I suppose this is to support the dualVMToken ?
It seems too me the end-to-end tests are using the starknet_token in Cairo folder.
Moreover it corresponds to a specific OZ version v0.6.0 hence any token in this version not having those modification will not be supported by the dualVMToken
Unless I miss something

enitrat added 3 commits October 11, 2024 15:29

dev: dualvm tokens deployment scripts

0d05253

fmt

307a895

batch some calls

5020f17

ClementWalter reviewed Oct 11, 2024

View reviewed changes

kakarot_scripts/deployment/dualvm_token_deployments.py

Comment on lines +33 to +35

# %%

Copy link

Member

ClementWalter Oct 11, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change

# %%

# %%

ClementWalter reviewed Oct 11, 2024

View reviewed changes

tests/end_to_end/CairoPrecompiles/test_dual_vm_token.py

Copy link

Member

ClementWalter Oct 11, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please define fixture in order

enitrat added 2 commits October 11, 2024 18:41

wip: fix dualvm tests

3b4b395

fmt

f6e4fe7

enitrat marked this pull request as draft October 11, 2024 18:02

obatirou reviewed Oct 13, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

dev(scripts): deploy default DualVM tokens #1499

dev(scripts): deploy default DualVM tokens #1499

enitrat commented Oct 11, 2024 •

edited by ClementWalter

Loading

ClementWalter Oct 11, 2024

ClementWalter Oct 11, 2024

ClementWalter Oct 11, 2024

ClementWalter Oct 11, 2024

ClementWalter Oct 11, 2024

ClementWalter Oct 11, 2024

ClementWalter Oct 11, 2024

ClementWalter Oct 11, 2024

ClementWalter Oct 11, 2024

ClementWalter Oct 11, 2024

ClementWalter Oct 11, 2024

ClementWalter Oct 11, 2024

ClementWalter Oct 11, 2024

ClementWalter Oct 11, 2024

codecov bot commented Oct 11, 2024

obatirou Oct 13, 2024

obatirou Oct 13, 2024

	Deploys a new DualVMToken for a corresponding Starknet ERC20 token.
	Deploy a new DualVMToken for a corresponding Starknet ERC20 token.



		async def load_tokens(network_name: str) -> List[Dict[str, Any]]:
		file_name = network_name.replace("starknet-", "")



		async def deploy_starknet_token(owner_address: str) -> Any:
		address = await deploy_starknet("StarknetToken", int(1e18), owner_address)

	async def get_tokens(network) -> List[Dict[str, Any]]:
	async def get_tokens_list(network) -> List[Dict[str, Any]]:

dev(scripts): deploy default DualVM tokens #1499

Are you sure you want to change the base?

dev(scripts): deploy default DualVM tokens #1499

Conversation

enitrat commented Oct 11, 2024 • edited by ClementWalter Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov bot commented Oct 11, 2024

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

enitrat commented Oct 11, 2024 •

edited by ClementWalter

Loading