fix: update for API route change #47

fubuloubu · 2024-06-05T20:05:52Z

What I did

just changed the API route

fixes: #46

How I did it

How to verify it

Checklist

Passes all linting checks (pre-commit and CI jobs)
New test cases have been added and are passing
Documentation has been updated
PR title follows Conventional Commit standard (will be automatically included in the changelog)

fubuloubu · 2024-06-05T22:26:16Z

TODO:

Check all endpoints for changes

solarthesis · 2024-06-06T09:26:16Z

Hey @fubuloubu I believe we still have issues, here is what it is throwing

*** pydantic_core._pydantic_core.ValidationError: 13 validation errors for UnexecutedTxData
safe
  Field required [type=missing, input_value={'executionDate': '2024-0...934F4F0C45f893042B190b'}, input_type=dict]
    For further information visit https://errors.pydantic.dev/2.7/v/missing
value
  Field required [type=missing, input_value={'executionDate': '2024-0...934F4F0C45f893042B190b'}, input_type=dict]
    For further information visit https://errors.pydantic.dev/2.7/v/missing
operation
  Field required [type=missing, input_value={'executionDate': '2024-0...934F4F0C45f893042B190b'}, input_type=dict]
    For further information visit https://errors.pydantic.dev/2.7/v/missing
gasToken
  Field required [type=missing, input_value={'executionDate': '2024-0...934F4F0C45f893042B190b'}, input_type=dict]
    For further information visit https://errors.pydantic.dev/2.7/v/missing
safeTxGas
  Field required [type=missing, input_value={'executionDate': '2024-0...934F4F0C45f893042B190b'}, input_type=dict]
    For further information visit https://errors.pydantic.dev/2.7/v/missing
baseGas
  Field required [type=missing, input_value={'executionDate': '2024-0...934F4F0C45f893042B190b'}, input_type=dict]
    For further information visit https://errors.pydantic.dev/2.7/v/missing
gasPrice
  Field required [type=missing, input_value={'executionDate': '2024-0...934F4F0C45f893042B190b'}, input_type=dict]
    For further information visit https://errors.pydantic.dev/2.7/v/missing
refundReceiver
  Field required [type=missing, input_value={'executionDate': '2024-0...934F4F0C45f893042B190b'}, input_type=dict]
    For further information visit https://errors.pydantic.dev/2.7/v/missing
nonce
  Field required [type=missing, input_value={'executionDate': '2024-0...934F4F0C45f893042B190b'}, input_type=dict]
    For further information visit https://errors.pydantic.dev/2.7/v/missing
submissionDate
  Field required [type=missing, input_value={'executionDate': '2024-0...934F4F0C45f893042B190b'}, input_type=dict]
    For further information visit https://errors.pydantic.dev/2.7/v/missing
modified
  Field required [type=missing, input_value={'executionDate': '2024-0...934F4F0C45f893042B190b'}, input_type=dict]
    For further information visit https://errors.pydantic.dev/2.7/v/missing
safeTxHash
  Field required [type=missing, input_value={'executionDate': '2024-0...934F4F0C45f893042B190b'}, input_type=dict]
    For further information visit https://errors.pydantic.dev/2.7/v/missing
confirmationsRequired
  Field required [type=missing, input_value={'executionDate': '2024-0...934F4F0C45f893042B190b'}, input_type=dict]
    For further information visit https://errors.pydantic.dev/2.7/v/missing

Here is an example I am trying to push, just sending 1 wei wETH from the safe to the safe.

from ape import Contract, networks
from ape.exceptions import SignatureError as SigError
from ape_safe import multisend
from functools import wraps
from ape import accounts

class GnosisSafe():
    
    def __init__(self):
        self.setup_deployer()
        self.setup_safe()

    def with_provider(func):
        @wraps(func)
        def wrapper(self,*args, **kwargs):
            provider  = getattr(getattr(networks,"optimism"),"mainnet")
            with provider.use_default_provider():
                return func(self,*args, **kwargs)
        return wrapper
        
    @with_provider
    def setup_safe(self):
        self.safe = accounts.load("test-safe")
    
    def setup_deployer(self):  
        self.deployer = accounts.load("test")
        self.deployer.set_autosign(True,passphrase='abc123')
                
    
    @with_provider
    def get_signers(self):
        return self.safe.signers
    
    @with_provider
    def get_next_safe_nonce(self):
        return self.safe.new_nonce

    @with_provider
    def post_gnosis_transaction(self,contractName,functionName,args):
        nonce          = self.get_next_safe_nonce()
        apeContract    = self.apeContracts[contractName]
        func           = getattr(apeContract,functionName)
        txn            = multisend.MultiSend()
        [txn.add(func,*arg) for arg in args]
        try:        
            txn(sender=self.safe,gas=0,submit_transaction=False,nonce=nonce)
        except SigError:                
            pass
        except Exception as e: 
            print(f"error staging transaction {e}")
            
            
    @with_provider
    def stage_test_transaction(self):
        abi='''[{"constant":false,"inputs":[{"name":"dst","type":"address"},{"name":"wad","type":"uint256"}],"name":"transfer","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"}]'''
        self.apeContracts = {}
        self.apeContracts["test"] = Contract(address="0x4200000000000000000000000000000000000006",abi=abi)
        self.post_gnosis_transaction(contractName='test', functionName='transfer', args=[[self.safe.address,1]]) 
    
#%%
if __name__ == '__main__':
    self = GnosisSafe()
    self.stage_test_transaction()

And here is the versions installed

(gnosis_perp_ape) thesis@ks:~$ ape --version
0.8.2

Installed Plugins
 alchemy      0.8.0
 etherscan    0.8.0
 solidity     0.8.0

Third-party Plugins
 optimism     0.8.0
 safe         0.8.1.dev1+g6ff9246

fubuloubu · 2024-06-06T13:34:35Z

@solarthesis confirmed this locally just using ape safe all-txns

solarthesis · 2024-06-06T13:55:19Z

@fubuloubu believe there are still things i'ts not liking

(gnosis_perp_ape) thesis@ks:~$ ape safe all-txns --network optimism:mainnet 0x2008A7DDf4770840B9C301A2722564b07ec7800c
INFO: Connecting to existing Geth node at https://mainnet.optimism.io/[hidden].
Traceback (most recent call last):
  File "/home/thesis/miniconda3/envs/gnosis_perp_ape/bin/ape", line 8, in <module>
    sys.exit(cli())
             ^^^^^
  File "/home/thesis/miniconda3/envs/gnosis_perp_ape/lib/python3.11/site-packages/click/core.py", line 1157, in __call__
    return self.main(*args, **kwargs)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/thesis/miniconda3/envs/gnosis_perp_ape/lib/python3.11/site-packages/click/core.py", line 1078, in main
    rv = self.invoke(ctx)
         ^^^^^^^^^^^^^^^^
  File "/home/thesis/miniconda3/envs/gnosis_perp_ape/lib/python3.11/site-packages/ape/_cli.py", line 88, in invoke
    return super().invoke(ctx)
           ^^^^^^^^^^^^^^^^^^^
  File "/home/thesis/miniconda3/envs/gnosis_perp_ape/lib/python3.11/site-packages/click/core.py", line 1688, in invoke
    return _process_result(sub_ctx.command.invoke(sub_ctx))
                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/thesis/miniconda3/envs/gnosis_perp_ape/lib/python3.11/site-packages/click/core.py", line 1688, in invoke
    return _process_result(sub_ctx.command.invoke(sub_ctx))
                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/thesis/miniconda3/envs/gnosis_perp_ape/lib/python3.11/site-packages/ape/cli/commands.py", line 98, in invoke
    return self._invoke(ctx, provider=provider)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/thesis/miniconda3/envs/gnosis_perp_ape/lib/python3.11/site-packages/ape/cli/commands.py", line 135, in _invoke
    return ctx.invoke(self.callback or (lambda: None), **ctx.params)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/thesis/miniconda3/envs/gnosis_perp_ape/lib/python3.11/site-packages/click/core.py", line 783, in invoke
    return __callback(*args, **kwargs)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/thesis/miniconda3/envs/gnosis_perp_ape/lib/python3.11/site-packages/click/decorators.py", line 92, in new_func
    return ctx.invoke(f, obj, *args, **kwargs)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/thesis/miniconda3/envs/gnosis_perp_ape/lib/python3.11/site-packages/click/core.py", line 783, in invoke
    return __callback(*args, **kwargs)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/thesis/miniconda3/envs/gnosis_perp_ape/lib/python3.11/site-packages/ape_safe/_cli/safe_mgmt.py", line 145, in all_txns
    for txn in client.get_transactions(confirmed=confirmed):
  File "/home/thesis/miniconda3/envs/gnosis_perp_ape/lib/python3.11/site-packages/ape_safe/client/base.py", line 82, in get_transactions
    for txn in self._all_transactions():
  File "/home/thesis/miniconda3/envs/gnosis_perp_ape/lib/python3.11/site-packages/ape_safe/client/__init__.py", line 95, in _all_transactions
    yield UnexecutedTxData.model_validate(txn)
          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/thesis/miniconda3/envs/gnosis_perp_ape/lib/python3.11/site-packages/pydantic/main.py", line 551, in model_validate
    return cls.__pydantic_validator__.validate_python(
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
pydantic_core._pydantic_core.ValidationError: 13 validation errors for UnexecutedTxData
safe
  Field required [type=missing, input_value={'executionDate': '2024-0...934F4F0C45f893042B190b'}, input_type=dict]
    For further information visit https://errors.pydantic.dev/2.7/v/missing
value
  Field required [type=missing, input_value={'executionDate': '2024-0...934F4F0C45f893042B190b'}, input_type=dict]
    For further information visit https://errors.pydantic.dev/2.7/v/missing
operation
  Field required [type=missing, input_value={'executionDate': '2024-0...934F4F0C45f893042B190b'}, input_type=dict]
    For further information visit https://errors.pydantic.dev/2.7/v/missing
gasToken
  Field required [type=missing, input_value={'executionDate': '2024-0...934F4F0C45f893042B190b'}, input_type=dict]
    For further information visit https://errors.pydantic.dev/2.7/v/missing
safeTxGas
  Field required [type=missing, input_value={'executionDate': '2024-0...934F4F0C45f893042B190b'}, input_type=dict]
    For further information visit https://errors.pydantic.dev/2.7/v/missing
baseGas
  Field required [type=missing, input_value={'executionDate': '2024-0...934F4F0C45f893042B190b'}, input_type=dict]
    For further information visit https://errors.pydantic.dev/2.7/v/missing
gasPrice
  Field required [type=missing, input_value={'executionDate': '2024-0...934F4F0C45f893042B190b'}, input_type=dict]
    For further information visit https://errors.pydantic.dev/2.7/v/missing
refundReceiver
  Field required [type=missing, input_value={'executionDate': '2024-0...934F4F0C45f893042B190b'}, input_type=dict]
    For further information visit https://errors.pydantic.dev/2.7/v/missing
nonce
  Field required [type=missing, input_value={'executionDate': '2024-0...934F4F0C45f893042B190b'}, input_type=dict]
    For further information visit https://errors.pydantic.dev/2.7/v/missing
submissionDate
  Field required [type=missing, input_value={'executionDate': '2024-0...934F4F0C45f893042B190b'}, input_type=dict]
    For further information visit https://errors.pydantic.dev/2.7/v/missing
modified
  Field required [type=missing, input_value={'executionDate': '2024-0...934F4F0C45f893042B190b'}, input_type=dict]
    For further information visit https://errors.pydantic.dev/2.7/v/missing
safeTxHash
  Field required [type=missing, input_value={'executionDate': '2024-0...934F4F0C45f893042B190b'}, input_type=dict]
    For further information visit https://errors.pydantic.dev/2.7/v/missing
confirmationsRequired
  Field required [type=missing, input_value={'executionDate': '2024-0...934F4F0C45f893042B190b'}, input_type=dict]
    For further information visit https://errors.pydantic.dev/2.7/v/missing
(gnosis_perp_ape) thesis@ks:~$

fubuloubu · 2024-06-06T14:01:40Z

Yeah was just saying I got the same issue that way haha, working on debugging

fubuloubu · 2024-06-06T14:48:30Z

@solarthesis should be fixed now!

solarthesis · 2024-06-06T14:54:46Z

ok let me test it out, 1 second

solarthesis · 2024-06-06T15:00:27Z

Works perfectly @fubuloubu

antazoey

couple o' nits / small-refactor opportunities

antazoey · 2024-06-06T14:58:42Z

ape_safe/_cli/safe_mgmt.py

    """
    View and filter all transactions for a given Safe using Safe API
    """
+    if account in cli_ctx.account_manager.aliases:


this logic seems argument-callback worthy

Yes but I think could be upstreamed to ape.cli

ape_safe/client/__init__.py

solarthesis · 2024-06-06T15:08:25Z

@Uxio0 please take note of breaking changes on gnosis api, which is causing issues for integrations like this safe-global/safe-transaction-service@6753c7a

fix: update for API route change

6ff9246

fubuloubu mentioned this pull request Jun 5, 2024

Api Update #46

Closed

fubuloubu marked this pull request as draft June 5, 2024 22:26

fubuloubu added 4 commits June 6, 2024 10:45

refactor: allow using address or alias

f7feae6

fix: /all-transactions includes incoming transactions now (skip them)

c7e0bc4

fix: just use page request next urls directly

a37a958

fix: accidentally was skipping ExecutedTxData because it was a subclass

d55b664

fubuloubu marked this pull request as ready for review June 6, 2024 14:48

fubuloubu requested review from antazoey and NotPeopling2day June 6, 2024 14:49

fubuloubu enabled auto-merge (squash) June 6, 2024 14:49

antazoey approved these changes Jun 6, 2024

View reviewed changes

fubuloubu merged commit 6797e66 into main Jun 6, 2024
28 checks passed

fubuloubu deleted the fix/api-update branch June 6, 2024 15:11

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: update for API route change #47

fix: update for API route change #47

fubuloubu commented Jun 5, 2024 •

edited

Loading

fubuloubu commented Jun 5, 2024

solarthesis commented Jun 6, 2024 •

edited

Loading

fubuloubu commented Jun 6, 2024

solarthesis commented Jun 6, 2024

fubuloubu commented Jun 6, 2024

fubuloubu commented Jun 6, 2024

solarthesis commented Jun 6, 2024

solarthesis commented Jun 6, 2024

antazoey left a comment

antazoey Jun 6, 2024

fubuloubu Jun 6, 2024

solarthesis commented Jun 6, 2024

fix: update for API route change #47

fix: update for API route change #47

Conversation

fubuloubu commented Jun 5, 2024 • edited Loading

What I did

How I did it

How to verify it

Checklist

fubuloubu commented Jun 5, 2024

solarthesis commented Jun 6, 2024 • edited Loading

fubuloubu commented Jun 6, 2024

solarthesis commented Jun 6, 2024

fubuloubu commented Jun 6, 2024

fubuloubu commented Jun 6, 2024

solarthesis commented Jun 6, 2024

solarthesis commented Jun 6, 2024

antazoey left a comment

Choose a reason for hiding this comment

antazoey Jun 6, 2024

Choose a reason for hiding this comment

fubuloubu Jun 6, 2024

Choose a reason for hiding this comment

solarthesis commented Jun 6, 2024

fubuloubu commented Jun 5, 2024 •

edited

Loading

solarthesis commented Jun 6, 2024 •

edited

Loading