Merge branch 'main' into market_depth

Author: wakamex

README.md

@@ -37,11 +37,11 @@ from agent0 import LocalHyperdrive, LocalChain
 # Initialize
 chain = LocalChain()
 hyperdrive = LocalHyperdrive(chain)
-hyperdrive_agent0 = hyperdrive.init_agent(base=FixedPoint(100_000))
+hyperdrive_agent0 = hyperdrive.init_agent(base=FixedPoint(100_000), eth=FixedPoint(10))
 
 # Run trades
 chain.advance_time(datetime.timedelta(weeks=1))
-open_long_event = hyperdrive_agent0.open_long(base=FixedPoint(100))
+open_long_event = hyperdrive_agent0.open_long(base=FixedPoint(100), eth=FixedPoint(10))
 chain.advance_time(datetime.timedelta(weeks=5))
 close_event = hyperdrive_agent0.close_long(
     maturity_time=open_long_event.maturity_time, bonds=open_long_event.bond_amount

STYLEGUIDE.md

@@ -7,4 +7,5 @@
 - Write docstrings in [Numpy format](https://numpydoc.readthedocs.io/en/latest/format.html), with a few tweaks:
   - Use "Arguments" instead of "Parameters".
   - Don't use space before `:` in the type specification. Sphinx and VSCode render it the same, and it's closer to the signature.
+- Document each class attribute immediately after its declaration ([example](https://github.com/delvtech/agent0/blob/86bebba71faeefb78b2f272e3ccf28e696e1828c/src/agent0/core/hyperdrive/interactive/local_chain.py#L43))
 - When in doubt, lean in the direction of verbosity and readability.

account.env.sample

@@ -7,15 +7,17 @@
 
 import pytest
 
-from agent0.chainsync.test_fixtures import database_engine, db_api, db_session, dummy_session, psql_docker
-from agent0.core.test_fixtures import chain
+from agent0.chainsync.test_fixtures import database_engine, db_session, dummy_session, psql_docker
 from agent0.core.test_utils import cycle_trade_policy
-from agent0.ethpy.test_fixtures import (
-    hyperdrive_read_interface,
-    hyperdrive_read_write_interface,
-    init_local_hyperdrive_pool,
-    local_chain,
-    local_hyperdrive_pool,
+from agent0.test_fixtures import (
+    chain_fixture,
+    fast_chain_fixture,
+    fast_hyperdrive_fixture,
+    hyperdrive_fixture,
+    hyperdrive_read_interface_fixture,
+    hyperdrive_read_write_interface_fixture,
+    init_chain,
+    init_hyperdrive,
 )
 
 # Hack to allow for vscode debugger to throw exception immediately
@@ -57,16 +59,17 @@ def pytest_internalerror(excinfo):
 # This allows for users of fixtures to not have to import all dependency fixtures when running
 # NOTE: this means pytest can only be ran from this directory
 __all__ = [
-    "chain",
+    "fast_chain_fixture",
+    "chain_fixture",
+    "init_chain",
+    "fast_hyperdrive_fixture",
+    "hyperdrive_fixture",
+    "init_hyperdrive",
     "cycle_trade_policy",
     "database_engine",
-    "db_api",
     "db_session",
     "dummy_session",
-    "hyperdrive_read_interface",
-    "hyperdrive_read_write_interface",
-    "init_local_hyperdrive_pool",
-    "local_chain",
-    "local_hyperdrive_pool",
+    "hyperdrive_read_interface_fixture",
+    "hyperdrive_read_write_interface_fixture",
     "psql_docker",
 ]

conftest.py

@@ -25,7 +25,7 @@
 # Launch a local anvil chain forked from the rpc uri.
 chain = LocalChain(fork_uri=rpc_uri, fork_block_number=fork_block_number)
 
-hyperdrive_address = Hyperdrive.get_hyperdrive_addresses_from_registry(registry_address, chain)["sdai_14_day"]
+hyperdrive_address = Hyperdrive.get_hyperdrive_addresses_from_registry(chain, registry_address)["sdai_14_day"]
 
 # Note that we use Hyperdrive here instead of LocalHyperdrive,
 # as LocalHyperdrive deploys a new pool, whereas we want to connect to an existing pool

eth.env.sample

@@ -37,7 +37,7 @@
 hyperdrive_agent0 = hyperdrive.init_agent(base=FixedPoint(100000), eth=FixedPoint(100), name="alice")
 hyperdrive_agent1 = hyperdrive_2.init_agent(base=FixedPoint(100000), eth=FixedPoint(100), name="bob")
 # Omission of name defaults to wallet address
-hyperdrive_agent2 = hyperdrive.init_agent(base=FixedPoint(100000))
+hyperdrive_agent2 = hyperdrive.init_agent(base=FixedPoint(100000), eth=FixedPoint(10))
 
 # Add funds to an agent
 hyperdrive_agent0.add_funds(base=FixedPoint(100000), eth=FixedPoint(100))
@@ -58,7 +58,7 @@
 open_long_event_2 = hyperdrive_agent0.open_long(FixedPoint(22222))
 
 # View current wallet
-print(hyperdrive_agent0.wallet)
+print(hyperdrive_agent0.get_positions())
 
 # NOTE these calls are chainwide calls, so all pools connected to this chain gets affected.
 # Advance time, accepts timedelta or seconds
@@ -72,7 +72,7 @@
     maturity_time=open_long_event_1.maturity_time, bonds=open_long_event_1.bond_amount
 )
 
-agent0_longs = list(hyperdrive_agent0.wallet.longs.values())
+agent0_longs = list(hyperdrive_agent0.get_positions().longs.values())
 close_long_event_2 = hyperdrive_agent0.close_long(
     maturity_time=agent0_longs[0].maturity_time, bonds=agent0_longs[0].balance
 )
@@ -85,7 +85,7 @@
 
 # LP
 add_lp_event = hyperdrive_agent2.add_liquidity(base=FixedPoint(44444))
-remove_lp_event = hyperdrive_agent2.remove_liquidity(shares=hyperdrive_agent2.wallet.lp_tokens)
+remove_lp_event = hyperdrive_agent2.remove_liquidity(shares=hyperdrive_agent2.get_positions().lp_tokens)
 
 # The above trades doesn't result in withdraw shares, but the function below allows you
 # to withdrawal shares from the pool.

examples/interactive_hyperdrive_forking_example.py

@@ -24,7 +24,7 @@
 # This is the registry address deployed on sepolia.
 registry_address = "0xba5156E697d39a03EDA824C19f375383F6b759EA"
 
-hyperdrive_address = Hyperdrive.get_hyperdrive_addresses_from_registry(registry_address, chain)["sdai_14_day"]
+hyperdrive_address = Hyperdrive.get_hyperdrive_addresses_from_registry(chain, registry_address)["sdai_14_day"]
 hyperdrive_config = Hyperdrive.Config()
 hyperdrive_pool = Hyperdrive(chain, hyperdrive_address, hyperdrive_config)