wayfinder-paths 0.1.11__py3-none-any.whl → 0.1.14__py3-none-any.whl

wayfinder_paths/core/utils/evm_helpers.py

@@ -43,12 +43,12 @@ def resolve_chain_id(token_info: dict[str, Any], logger_instance=None) -> int |
     """
     log = logger_instance or logger
     chain_meta = token_info.get("chain") or {}
-    chain_id = chain_meta.get("chain_id")
+    chain_id = chain_meta.get("id")
     try:
         if chain_id is not None:
             return int(chain_id)
     except (ValueError, TypeError):
-        log.debug("Invalid chain_id in token_info.chain_id: %s", chain_id)
+        log.debug("Invalid chain_id in token_info.chain: %s", chain_id)
     return chain_code_to_chain_id(chain_meta.get("code"))
 
 
@@ -78,9 +78,13 @@ def resolve_rpc_url(
     if chain_id is not None and isinstance(mapping, dict):
         by_int = mapping.get(chain_id)
         if by_int:
+            if isinstance(by_int, list):
+                return str(by_int[0])
             return str(by_int)
         by_str = mapping.get(str(chain_id))
         if by_str:
+            if isinstance(by_str, list):
+                return str(by_str[0])
             return str(by_str)
     raise ValueError("RPC URL not provided. Set strategy.rpc_urls in config.json.")
 
@@ -133,7 +137,7 @@ def resolve_private_key_for_from_address(
     if strategy_addr and from_addr_norm == (strategy_addr or "").lower():
         return strategy_pk
 
-    # No fallback - private keys must be in config or wallets.json
+    # No fallback - private keys must be in config or config.json
     return None
 
 

wayfinder_paths/core/utils/wallets.py

@@ -6,11 +6,7 @@ from eth_account import Account
 
 
 def make_random_wallet() -> dict[str, str]:
-    """Generate a new random wallet.
-
-    Returns a mapping with keys: "address" and "private_key_hex" (0x-prefixed).
-    """
-    acct = Account.create()  # uses os.urandom
+    acct = Account.create()
     return {
         "address": acct.address,
         "private_key_hex": acct.key.hex(),
@@ -22,33 +18,31 @@ def _load_existing_wallets(file_path: Path) -> list[dict[str, Any]]:
         return []
     try:
         parsed = json.loads(file_path.read_text())
-        if isinstance(parsed, list):
-            return parsed
         if isinstance(parsed, dict):
             wallets = parsed.get("wallets")
             if isinstance(wallets, list):
                 return wallets
         return []
     except Exception:
-        # If the file is malformed, start fresh rather than raising.
         return []
 
 
 def _save_wallets(file_path: Path, wallets: list[dict[str, Any]]) -> None:
-    # Ensure stable ordering by address for readability
+    config = {}
+    if file_path.exists():
+        try:
+            config = json.loads(file_path.read_text())
+        except Exception:
+            pass
+
     sorted_wallets = sorted(wallets, key=lambda w: w.get("address", ""))
-    file_path.write_text(json.dumps(sorted_wallets, indent=2))
+    config["wallets"] = sorted_wallets
+    file_path.write_text(json.dumps(config, indent=2))
 
 
 def write_wallet_to_json(
-    wallet: dict[str, str], out_dir: str | Path = ".", filename: str = "wallets.json"
+    wallet: dict[str, str], out_dir: str | Path = ".", filename: str = "config.json"
 ) -> Path:
-    """Create or update a wallets.json with the provided wallet.
-
-    - Ensures the output directory exists.
-    - Merges with existing entries keyed by address (updates if present, appends otherwise).
-    - Writes a pretty-printed JSON list of wallet objects.
-    """
     out_dir_path = Path(out_dir)
     out_dir_path.mkdir(parents=True, exist_ok=True)
     file_path = out_dir_path / filename
@@ -71,7 +65,6 @@ def write_wallet_to_json(
 
 
 def load_wallets(
-    out_dir: str | Path = ".", filename: str = "wallets.json"
+    out_dir: str | Path = ".", filename: str = "config.json"
 ) -> list[dict[str, Any]]:
-    """Public helper to read wallets.json as a list of wallet dicts."""
     return _load_existing_wallets(Path(out_dir) / filename)

wayfinder_paths/core/wallets/README.md

@@ -1,6 +1,6 @@
 # Wallet Abstraction Layer
 
-Wayfinder strategies interact with blockchains through a single abstraction: the `EvmTxn` interface defined in `wayfinder_paths/core/services/base.py`. The default implementation (`LocalEvmTxn`) signs transactions with private keys pulled from config.json or wallets.json, while `WalletManager` resolves which provider to use at runtime.
+Wayfinder strategies interact with blockchains through a single abstraction: the `EvmTxn` interface defined in `wayfinder_paths/core/services/base.py`. The default implementation (`LocalEvmTxn`) signs transactions with private keys pulled from config.json or config.json, while `WalletManager` resolves which provider to use at runtime.
 
 ## Pieces
 

wayfinder_paths/run_strategy.py

@@ -20,7 +20,6 @@ def load_strategy(
     strategy_name: str,
     *,
     strategy_config: dict | None = None,
-    api_key: str | None = None,
 ):
     """
     Dynamically load a strategy by name
@@ -28,7 +27,6 @@ def load_strategy(
     Args:
         strategy_name: Name of the strategy to load (directory name in strategies/)
         strategy_config: Configuration dict for the strategy
-        api_key: Optional API key for service account authentication
 
     Returns:
         Strategy instance
@@ -70,7 +68,7 @@ def load_strategy(
     if strategy_class is None:
         raise ValueError(f"No Strategy class found in {module_path}")
 
-    return strategy_class(config=strategy_config, api_key=api_key)
+    return strategy_class(config=strategy_config)
 
 
 def load_config(
@@ -136,15 +134,14 @@ async def run_strategy(
         logger.debug(f"Config path provided: {config_path}")
         config = load_config(config_path, strategy_name=strategy_name)
         logger.debug(
-            "Loaded config: creds=%s wallets(main=%s strategy=%s)",
-            "yes"
-            if (config.user.username and config.user.password)
-            or config.user.refresh_token
-            else "no",
-            (config.user.main_wallet_address or "none"),
-            (config.user.strategy_wallet_address or "none"),
+            "Loaded config: wallets(main={} strategy={})",
+            config.user.main_wallet_address or "none",
+            config.user.strategy_wallet_address or "none",
         )
 
+        # Validate required configuration
+        # Authentication is via system.api_key in config.json
+
         # Load strategy with the enriched config
         strategy = load_strategy(
             strategy_name,
@@ -157,13 +154,7 @@ async def run_strategy(
 
         # Setup strategy job
         logger.info("Setting up strategy job...")
-        logger.debug(
-            "Auth mode: %s",
-            "credentials"
-            if (config.user.username and config.user.password)
-            or config.user.refresh_token
-            else "missing",
-        )
+        logger.debug("Auth mode: API key (from system.api_key)")
         await strategy_job.setup()
 
         # Execute action

wayfinder_paths/scripts/create_strategy.py

@@ -62,8 +62,8 @@ def main():
     parser.add_argument(
         "--wallets-file",
         type=Path,
-        default=Path(__file__).parent.parent.parent / "wallets.json",
-        help="Path to wallets.json file",
+        default=Path(__file__).parent.parent.parent / "config.json",
+        help="Path to config.json file",
     )
     parser.add_argument(
         "--override",
@@ -121,9 +121,9 @@ def main():
         print(f"  Updated strategy.py with class name: {class_name}")
 
     # Generate wallet with label matching directory name (strategy identifier)
-    # If wallets.json doesn't exist, create it with a main wallet first
+    # If config.json doesn't exist, create it with a main wallet first
     if not args.wallets_file.exists():
-        print("  Creating new wallets.json with main wallet...")
+        print("  Creating new config.json with main wallet...")
         main_wallet = make_random_wallet()
         main_wallet["label"] = "main"
         write_wallet_to_json(
@@ -133,7 +133,7 @@ def main():
         )
         print(f"  Generated main wallet: {main_wallet['address']}")
 
-    # Generate strategy wallet (will append to existing wallets.json)
+    # Generate strategy wallet (will append to existing config.json)
     wallet = make_random_wallet()
     wallet["label"] = dir_name
     write_wallet_to_json(

wayfinder_paths/scripts/make_wallets.py

@@ -27,7 +27,7 @@ def main():
         "--out-dir",
         type=Path,
         default=Path("."),
-        help="Output directory for wallets.json (and keystore files)",
+        help="Output directory for config.json (and keystore files)",
     )
     parser.add_argument(
         "--keystore-password",
@@ -55,7 +55,7 @@ def main():
     args.out_dir.mkdir(parents=True, exist_ok=True)
 
     # Load existing wallets
-    existing = load_wallets(args.out_dir, "wallets.json")
+    existing = load_wallets(args.out_dir, "config.json")
     has_main = any(w.get("label") in ("main", "default") for w in existing)
 
     rows: list[dict[str, str]] = []
@@ -72,7 +72,7 @@ def main():
             w["label"] = args.label
             rows.append(w)
             print(f"[{index}] {w['address']}  (label: {args.label})")
-            write_wallet_to_json(w, out_dir=args.out_dir, filename="wallets.json")
+            write_wallet_to_json(w, out_dir=args.out_dir, filename="config.json")
             if args.keystore_password:
                 ks = to_keystore_json(w["private_key_hex"], args.keystore_password)
                 ks_path = args.out_dir / f"keystore_{w['address']}.json"
@@ -86,7 +86,7 @@ def main():
                 rows.append(main_w)
                 print(f"[{index}] {main_w['address']}  (main)")
                 write_wallet_to_json(
-                    main_w, out_dir=args.out_dir, filename="wallets.json"
+                    main_w, out_dir=args.out_dir, filename="config.json"
                 )
                 if args.keystore_password:
                     ks = to_keystore_json(
@@ -133,7 +133,7 @@ def main():
                 rows.append(w)
                 print(f"[{index}] {w['address']}  (label: temporary_{next_temp_num})")
 
-            write_wallet_to_json(w, out_dir=args.out_dir, filename="wallets.json")
+            write_wallet_to_json(w, out_dir=args.out_dir, filename="config.json")
             if args.keystore_password:
                 ks = to_keystore_json(w["private_key_hex"], args.keystore_password)
                 ks_path = args.out_dir / f"keystore_{w['address']}.json"

wayfinder_paths/scripts/run_strategy.py

@@ -27,7 +27,7 @@ def _find_wallet(wallets: list[dict[str, Any]], label: str) -> dict[str, Any]:
     for w in wallets:
         if w.get("label") == label:
             return w
-    raise ValueError(f"Wallet label not found in wallets.json: {label}")
+    raise ValueError(f"Wallet label not found in config.json: {label}")
 
 
 def _get_strategy_class(strategy: str):
@@ -58,7 +58,7 @@ def _get_strategy_class(strategy: str):
 async def _run(args: argparse.Namespace) -> int:
     repo_root = Path(__file__).resolve().parents[2]
     wallets_path = (
-        Path(args.wallets).resolve() if args.wallets else repo_root / "wallets.json"
+        Path(args.wallets).resolve() if args.wallets else repo_root / "config.json"
     )
     config_path = (
         Path(args.config).resolve() if args.config else repo_root / "config.json"
@@ -123,7 +123,7 @@ def main() -> int:
         ],
     )
     p.add_argument(
-        "--wallets", default=None, help="Path to wallets.json (default: repo root)"
+        "--wallets", default=None, help="Path to config.json (default: repo root)"
     )
     p.add_argument(
         "--config", default=None, help="Path to config.json (default: repo root)"

wayfinder_paths/strategies/basis_trading_strategy/snapshot_mixin.py

@@ -38,7 +38,7 @@ class BasisSnapshotMixin:
         entry_cost_usd: float,
         exit_cost_usd: float,
     ) -> dict[str, Any]:
-        """Build the `safe[horizon]` entry matching Django output shape."""
+        """Build the `safe[horizon]` entry matching the expected output shape."""
         L = max(1, int(leverage))
 
         depth_checks = depth_checks or {}