fix compute_address calls (#744)

jsign · web-flow · commit 5a2880527b16 · 2024-08-13T20:26:34.000+01:00
Signed-off-by: Ignacio Hagopian &lt;jsign.uy@gmail.com&gt;
diff --git a/tests/verkle/eip4762_verkle_gas_witness/test_codecopy_generic_initcode.py b/tests/verkle/eip4762_verkle_gas_witness/test_codecopy_generic_initcode.py
@@ -50,7 +50,7 @@ def test_generic_codecopy_initcode(blockchain_test: BlockchainTestFiller, fork:
         TestAddress: Account(balance=1000000000000000000000),
     }
 
-    contract_address = compute_create_address(TestAddress, 0)
+    contract_address = compute_create_address(address=TestAddress, nonce=0)
     if instruction == Op.EXTCODECOPY:
         deploy_code = Op.EXTCODECOPY(contract_address, 0, 0, 100) + Op.ORIGIN * 100
         data = Initcode(deploy_code=deploy_code)
diff --git a/tests/verkle/eip4762_verkle_gas_witness/test_creates.py b/tests/verkle/eip4762_verkle_gas_witness/test_creates.py
@@ -65,7 +65,7 @@ def test_create(
     """
     contract_code = Op.PUSH0 * code_size
     if create_instruction is None or create_instruction == Op.CREATE:
-        contract_address = compute_create_address(TestAddress, 0)
+        contract_address = compute_create_address(address=TestAddress, nonce=0)
     else:
         contract_address = compute_create2_address(
             TestAddress, 0xDEADBEEF, Initcode(deploy_code=contract_code)
@@ -129,7 +129,7 @@ def test_create_insufficient_gas(
     """
     contract_code = Op.PUSH0 * (129 * 31 + 42)
     if create_instruction is None or create_instruction == Op.CREATE:
-        contract_address = compute_create_address(TestAddress, 0)
+        contract_address = compute_create_address(address=TestAddress, nonce=0)
     else:
         contract_address = compute_create2_address(
             TestAddress, 0xDEADBEEF, Initcode(deploy_code=contract_code)
@@ -237,7 +237,7 @@ def test_big_calldata(
     """
     contract_code = Op.PUSH0 * (1000 * 31 + 42)
     if create_instruction is None or create_instruction == Op.CREATE:
-        contract_address = compute_create_address(TestAddress, 0)
+        contract_address = compute_create_address(address=TestAddress, nonce=0)
     else:
         contract_address = compute_create2_address(
             TestAddress, 0xDEADBEEF, Initcode(deploy_code=contract_code)
@@ -291,7 +291,7 @@ def _create(
         tx_value = 0
         tx_data = deploy_code
         if generate_collision:
-            contract_address = compute_create_address(TestAddress, 0)
+            contract_address = compute_create_address(address=TestAddress, nonce=0)
             pre[contract_address] = Account(nonce=1)
     elif create_instruction is not None and create_instruction.int() == Op.CREATE2.int():
         pre[TestAddress2] = Account(
@@ -309,7 +309,7 @@ def _create(
         tx_value = value
         tx_data = deploy_code
         if generate_collision:
-            contract_address = compute_create_address(TestAddress, 0)
+            contract_address = compute_create_address(address=TestAddress, nonce=0)
             pre[contract_address] = Account(nonce=1)
 
     tx = Transaction(
diff --git a/tests/verkle/eip4762_verkle_gas_witness/test_extcodesize.py b/tests/verkle/eip4762_verkle_gas_witness/test_extcodesize.py
@@ -131,7 +131,7 @@ def _extcodesize(
 
     post = {}
     if not fails:
-        contract_address = compute_create_address(TestAddress, tx.nonce)
+        contract_address = compute_create_address(address=TestAddress, nonce=tx.nonce)
         post[contract_address] = Account(storage={0: len(bytecode)})
 
     # witness = Witness()
diff --git a/tests/verkle/eip6800_genesis_verkle_tree/test_contract_codechunking.py b/tests/verkle/eip6800_genesis_verkle_tree/test_contract_codechunking.py
@@ -77,7 +77,7 @@ def test_code_chunking(blockchain_test: BlockchainTestFiller, fork: str, bytecod
     )
     blocks = [Block(txs=[tx])]
 
-    contract_address = compute_create_address(TestAddress, tx.nonce)
+    contract_address = compute_create_address(address=TestAddress, nonce=tx.nonce)
 
     post = {
         contract_address: Account(
diff --git a/tests/verkle/eip6800_genesis_verkle_tree/test_contract_creation.py b/tests/verkle/eip6800_genesis_verkle_tree/test_contract_creation.py
@@ -68,7 +68,7 @@ def test_contract_creation(
     )
     blocks = [Block(txs=[tx])]
 
-    contract_address = compute_create_address(TestAddress, tx.nonce)
+    contract_address = compute_create_address(address=TestAddress, nonce=tx.nonce)
 
     post = {
         contract_address: Account(
diff --git a/tests/verkle/eip6800_genesis_verkle_tree/test_storage_slot_write.py b/tests/verkle/eip6800_genesis_verkle_tree/test_storage_slot_write.py
@@ -72,7 +72,7 @@ def test_storage_slot_write(blockchain_test: BlockchainTestFiller, fork: str, sl
     )
     blocks = [Block(txs=[tx])]
 
-    contract_address = compute_create_address(TestAddress, tx.nonce)
+    contract_address = compute_create_address(address=TestAddress, nonce=tx.nonce)
 
     post = {
         contract_address: Account(

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ def test_generic_codecopy_initcode(blockchain_test: BlockchainTestFiller, fork:`
`50`	`50`	`TestAddress: Account(balance=1000000000000000000000),`
`51`	`51`	`}`
`52`	`52`
`53`		`- contract_address = compute_create_address(TestAddress, 0)`
	`53`	`+ contract_address = compute_create_address(address=TestAddress, nonce=0)`
`54`	`54`	`if instruction == Op.EXTCODECOPY:`
`55`	`55`	`deploy_code = Op.EXTCODECOPY(contract_address, 0, 0, 100) + Op.ORIGIN * 100`
`56`	`56`	`data = Initcode(deploy_code=deploy_code)`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ def test_code_chunking(blockchain_test: BlockchainTestFiller, fork: str, bytecod`
`77`	`77`	`)`
`78`	`78`	`blocks = [Block(txs=[tx])]`
`79`	`79`
`80`		`- contract_address = compute_create_address(TestAddress, tx.nonce)`
	`80`	`+ contract_address = compute_create_address(address=TestAddress, nonce=tx.nonce)`
`81`	`81`
`82`	`82`	`post = {`
`83`	`83`	`contract_address: Account(`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ def test_contract_creation(`
`68`	`68`	`)`
`69`	`69`	`blocks = [Block(txs=[tx])]`
`70`	`70`
`71`		`- contract_address = compute_create_address(TestAddress, tx.nonce)`
	`71`	`+ contract_address = compute_create_address(address=TestAddress, nonce=tx.nonce)`
`72`	`72`
`73`	`73`	`post = {`
`74`	`74`	`contract_address: Account(`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ def test_storage_slot_write(blockchain_test: BlockchainTestFiller, fork: str, sl`
`72`	`72`	`)`
`73`	`73`	`blocks = [Block(txs=[tx])]`
`74`	`74`
`75`		`- contract_address = compute_create_address(TestAddress, tx.nonce)`
	`75`	`+ contract_address = compute_create_address(address=TestAddress, nonce=tx.nonce)`
`76`	`76`
`77`	`77`	`post = {`
`78`	`78`	`contract_address: Account(`