Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ape 0.8 #316

Merged
merged 6 commits into from
Aug 23, 2024
Merged

Ape 0.8 #316

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
594848f
Relock dependencies to latest versions.
derekpierre Aug 22, 2024
7c2941d
Prettier should ignore Pipfile.lock
derekpierre Aug 22, 2024
2eceb03
Remove import re-mappings since no longer needed with newer version o…
derekpierre Aug 22, 2024
e45d458
Obtain contract instance receipt from the creation metadata available…
derekpierre Aug 22, 2024
a992b50
Remove managed allow list deployment script since no longer needed.
derekpierre Aug 22, 2024
9e44ae8
Remove unused Destroyable contract and corresponding test - fails wit…
derekpierre Aug 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 0 additions & 40 deletions contracts/test/proxy/Destroyable.sol
View file
Open in desktop

This file was deleted.

98 changes: 0 additions & 98 deletions tests/test_dispatcher.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
"""

import ape
import pytest
from ape.utils import ZERO_ADDRESS


Expand Down Expand Up @@ -339,103 +338,6 @@ def test_dispatcher(project, accounts):
]


def test_selfdestruct(project, accounts):
creator = accounts[0]
account = accounts[1]

# Deploy contract and destroy it
contract1_lib = creator.deploy(project.Destroyable, 22)
assert 22 == contract1_lib.constructorValue()
contract1_lib.destroy(sender=creator)
with pytest.raises(ape.exceptions.ContractNotFoundError):
contract1_lib.constructorValue()

# Can't create dispatcher using address without contract
with ape.reverts():
creator.deploy(project.Dispatcher, ZERO_ADDRESS)
with ape.reverts():
creator.deploy(project.Dispatcher, account)
with ape.reverts():
creator.deploy(project.Dispatcher, contract1_lib.address)

# Deploy contract again with a dispatcher targeting it
contract2_lib = creator.deploy(project.Destroyable, 23)
dispatcher = creator.deploy(project.Dispatcher, contract2_lib.address)
assert contract2_lib.address == dispatcher.target()

contract_instance = project.Destroyable.at(dispatcher.address)
contract_instance.setFunctionValue(34, sender=accounts[0])
assert 23 == contract_instance.constructorValue()
assert 34 == contract_instance.functionValue()

# Can't upgrade to an address without contract
with ape.reverts():
dispatcher.upgrade(ZERO_ADDRESS, sender=creator)
with ape.reverts():
dispatcher.upgrade(account, sender=creator)
with ape.reverts():
dispatcher.upgrade(contract1_lib.address, sender=creator)

# Destroy library
contract2_lib.destroy(sender=creator)
# Dispatcher must determine that there is no contract
with ape.reverts():
contract_instance.constructorValue()

# Can't upgrade to an address without contract
with ape.reverts():
dispatcher.upgrade(ZERO_ADDRESS, sender=creator)
with ape.reverts():
dispatcher.upgrade(account, sender=creator)
with ape.reverts():
dispatcher.upgrade(contract1_lib.address, sender=creator)

# Deploy the same contract again and upgrade to this contract
contract3_lib = creator.deploy(project.Destroyable, 24)
dispatcher.upgrade(contract3_lib.address, sender=creator)
assert 24 == contract_instance.constructorValue()
assert 34 == contract_instance.functionValue()

# Can't rollback because the previous version is destroyed
with ape.reverts():
dispatcher.rollback(sender=account)

# Destroy again
contract3_lib.destroy(sender=creator)
with ape.reverts():
contract_instance.constructorValue()

# Still can't rollback because the previous version is destroyed
with ape.reverts():
dispatcher.rollback(sender=account)

# Deploy the same contract twice and upgrade to the latest contract
contract4_lib = creator.deploy(project.Destroyable, 25)
contract5_lib = creator.deploy(project.Destroyable, 26)
dispatcher.upgrade(contract4_lib.address, sender=creator)
dispatcher.upgrade(contract5_lib.address, sender=creator)
assert 26 == contract_instance.constructorValue()
assert 34 == contract_instance.functionValue()

# Destroy the previous version of the contract and try to rollback again
contract4_lib.destroy(sender=creator)
with ape.reverts():
dispatcher.rollback(sender=account)

# Deploy the same contract again and upgrade
contract6_lib = creator.deploy(project.Destroyable, 27)
dispatcher.upgrade(contract6_lib.address, sender=creator)
assert 27 == contract_instance.constructorValue()
assert 34 == contract_instance.functionValue()

# Destroy the current version of the contract
contract6_lib.destroy(sender=creator)
# Now rollback must work, the previous version is fine
dispatcher.rollback(sender=creator)
assert 26 == contract_instance.constructorValue()
assert 34 == contract_instance.functionValue()


def test_receive_fallback(project, accounts):
creator = accounts[0]
# Deploy first contract
Expand Down
Loading