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.

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

Integrate Tenderly to local_web3 #436

Merged
merged 2 commits into from
Sep 26, 2024
Merged

Integrate Tenderly to local_web3 #436

merged 2 commits into from
Sep 26, 2024

Conversation

kongzii
Copy link
Contributor

@kongzii kongzii commented Sep 26, 2024

No description provided.

Copy link

coderabbitai bot commented Sep 26, 2024

Walkthrough

The changes introduce a new optional configuration variable TENDERLY_FORK_RPC in the APIKeys class, allowing for the specification of a Tenderly fork RPC endpoint. Additionally, a new function fund_account_on_tenderly is added to facilitate funding test accounts on the Tenderly platform. The local_web3 fixture is updated to accommodate a list of test accounts and to utilize the Tenderly RPC if available, ensuring the correct funding of accounts with xDai.

Changes

Files Change Summary
prediction_market_agent_tooling/config.py Added a new optional configuration variable TENDERLY_FORK_RPC of type Optional[str] in the APIKeys class.
tests_integration_with_local_chain/conftest.py Introduced the fund_account_on_tenderly function for funding test accounts via JSON-RPC. Updated the local_web3 fixture to include an accounts parameter for TestAccount instances and modified its logic for using Tenderly RPC.

Sequence Diagram(s)

sequenceDiagram
    participant User
    participant Tenderly
    participant Web3
    participant LocalChain

    User->>Web3: Request local web3 instance
    Web3->>Tenderly: Check for Tenderly RPC availability
    alt Tenderly RPC available
        Web3->>Tenderly: Create Web3 instance
        Web3->>Tenderly: Fund accounts with xDai
    else Tenderly RPC not available
        Web3->>LocalChain: Fallback to Foundry network
    end
Loading

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🧹 Outside diff range and nitpick comments (2)
prediction_market_agent_tooling/config.py (1)

38-38: LGTM! Consider adding a property method and documentation.

The addition of TENDERLY_FORK_RPC is consistent with the existing code style and aligns with the PR objective of integrating Tenderly. However, for improved consistency and clarity, consider the following suggestions:

  1. Add a property method for TENDERLY_FORK_RPC, similar to other variables in this class. This would allow for any necessary checks or transformations.

  2. Add a docstring to explain the purpose and expected format of this configuration option.

Here's a suggested implementation:

TENDERLY_FORK_RPC: t.Optional[str] = None

@property
def tenderly_fork_rpc(self) -> t.Optional[str]:
    """
    Returns the Tenderly fork RPC endpoint if configured.
    
    This should be a valid HTTP or HTTPS URL pointing to a Tenderly fork RPC endpoint.
    If not set, it returns None, indicating that Tenderly integration is not configured.
    """
    return self.TENDERLY_FORK_RPC

This addition would maintain consistency with other properties in the class and provide clear documentation for users of this configuration.

tests_integration_with_local_chain/conftest.py (1)

31-46: Replace print statements with logging for better control over output

Consider using the logging module instead of print statements. This allows for better control over log levels and integrates well with testing frameworks.

Apply this diff to implement logging:

+import logging

...

 @pytest.fixture(scope="session")
 def local_web3(
     load_env: None, chain: ChainManager, accounts: list[TestAccount]
 ) -> t.Generator[Web3, None, None]:
+    logger = logging.getLogger(__name__)
-    print("entering fixture local_web3")
+    logger.debug("Entering fixture local_web3")

     if (tenderly_fork_rpc := APIKeys().TENDERLY_FORK_RPC) is not None:
-        print("using tenderly rpc")
+        logger.info("Using Tenderly RPC")
         w3 = Web3(Web3.HTTPProvider(tenderly_fork_rpc))
-        print("funding test accounts on tenderly")
+        logger.info("Funding test accounts on Tenderly")
         fund_account_on_tenderly(
             tenderly_fork_rpc, [a.address for a in accounts], xdai_type(1000)
         )
         yield w3
     else:
-        print("using foundry")
+        logger.info("Using Foundry")
         with chain.network_manager.parse_network_choice(
             "gnosis:mainnet_fork:foundry"
         ) as provider:
             w3 = Web3(Web3.HTTPProvider(provider.http_uri))
             yield w3

-    print("exiting fixture local_web3")
+    logger.debug("Exiting fixture local_web3")
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between 53a85c9 and 6e352b0.

📒 Files selected for processing (2)
  • prediction_market_agent_tooling/config.py (1 hunks)
  • tests_integration_with_local_chain/conftest.py (3 hunks)
🔇 Additional comments (2)
tests_integration_with_local_chain/conftest.py (2)

71-72: Verify the correctness of the tenderly_setBalance JSON-RPC method

Ensure that the tenderly_setBalance method is correctly named and supported by the Tenderly RPC API. Any mismatches could result in failures when funding accounts.


28-29: Update dependent fixtures and tests to include the new accounts parameter

The local_web3 fixture now accepts an additional parameter accounts: list[TestAccount]. Ensure that all fixtures and tests that depend on local_web3 are updated to pass the accounts argument to prevent any runtime errors.

Run the following script to identify usages of local_web3 that may need updating:

✅ Verification successful

Verification Successful: No usages of local_web3 found in the test suite. No updates to fixtures or tests are necessary.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Find all usages of `local_web3` in the test suite.

rg --type py --word-regex '\blocal_web3\b' tests/

Length of output: 495


Script:

#!/bin/bash
# Description: Find all usages of `local_web3` in the test suite using the correct flag.

rg --type py --word-regexp '\blocal_web3\b' tests/

Length of output: 52

Comment on lines +66 to +75
def fund_account_on_tenderly(
fork_rpc: str, addresses: list[HexAddress], balance: xDai
) -> None:
payload = {
"jsonrpc": "2.0",
"method": "tenderly_setBalance",
"params": [addresses, f"0x{xdai_to_wei(balance):X}"],
}
response = requests.post(fork_rpc, json=payload)
response.raise_for_status()
Copy link

Choose a reason for hiding this comment

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

⚠️ Potential issue

Add error handling for the Tenderly account funding process

To enhance robustness, consider adding error handling to manage potential exceptions or errors when making the HTTP request to fund accounts on Tenderly. This ensures that any issues are caught and appropriately handled.

Apply this diff to improve error handling:

 def fund_account_on_tenderly(
     fork_rpc: str, addresses: list[HexAddress], balance: xDai
 ) -> None:
     payload = {
         "jsonrpc": "2.0",
         "method": "tenderly_setBalance",
         "params": [addresses, f"0x{xdai_to_wei(balance):X}"],
     }
     response = requests.post(fork_rpc, json=payload)
     response.raise_for_status()
+    result = response.json()
+    if 'error' in result:
+        raise Exception(f"Error funding accounts: {result['error']}")
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
def fund_account_on_tenderly(
fork_rpc: str, addresses: list[HexAddress], balance: xDai
) -> None:
payload = {
"jsonrpc": "2.0",
"method": "tenderly_setBalance",
"params": [addresses, f"0x{xdai_to_wei(balance):X}"],
}
response = requests.post(fork_rpc, json=payload)
response.raise_for_status()
def fund_account_on_tenderly(
fork_rpc: str, addresses: list[HexAddress], balance: xDai
) -> None:
payload = {
"jsonrpc": "2.0",
"method": "tenderly_setBalance",
"params": [addresses, f"0x{xdai_to_wei(balance):X}"],
}
response = requests.post(fork_rpc, json=payload)
response.raise_for_status()
result = response.json()
if 'error' in result:
raise Exception(f"Error funding accounts: {result['error']}")

Copy link
Contributor

@evangriffiths evangriffiths left a comment

Choose a reason for hiding this comment

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

Noob question - why do we need to support tenderly here in addition to foundry? As I understand it, tenderly is for running solidity tests on a mock chain. What's the use of that in this repo?

@kongzii
Copy link
Contributor Author

kongzii commented Sep 26, 2024

Noob question - why do we need to support tenderly here in addition to foundry? As I understand it, tenderly is for running solidity tests on a mock chain. What's the use of that in this repo?

Use case is if you are creating a test against local chain (foundry), but it's failing without obvious reasons. You can switch to Tenderly by providing env variable and then, you can debug your test on Tenderly.

@gabrielfior gabrielfior self-requested a review September 26, 2024 13:46
@kongzii kongzii merged commit 247e7b2 into main Sep 26, 2024
8 checks passed
@kongzii kongzii deleted the peter/integrate-tenderly branch September 26, 2024 14:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants