fix: address CodeRabbit review — writable flag, account layout tests, parametrize surfpool

- Set MAYHEM_PROGRAM_ID to is_writable=False in create_v2 (read-only per IDL)
- Add account count + position assertions to create_v2 instruction tests
- Parametrize 8 surfpool launch tests into single matrix test

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: smypmsa

src/pumpfun_cli/protocol/instructions.py

@@ -323,7 +323,7 @@ def build_create_instructions(
         AccountMeta(pubkey=ASSOCIATED_TOKEN_PROGRAM, is_signer=False, is_writable=False),
         # Mayhem accounts are always required by create_v2 per IDL,
         # regardless of is_mayhem_mode flag value.
-        AccountMeta(pubkey=MAYHEM_PROGRAM_ID, is_signer=False, is_writable=True),
+        AccountMeta(pubkey=MAYHEM_PROGRAM_ID, is_signer=False, is_writable=False),
         AccountMeta(pubkey=MAYHEM_GLOBAL_PARAMS, is_signer=False, is_writable=False),
         AccountMeta(pubkey=MAYHEM_SOL_VAULT, is_signer=False, is_writable=True),
         AccountMeta(pubkey=mayhem_state, is_signer=False, is_writable=True),

tests/test_protocol/test_instructions.py

@@ -3,14 +3,23 @@
 from solders.pubkey import Pubkey
 
 from pumpfun_cli.protocol.address import derive_associated_bonding_curve, derive_bonding_curve
-from pumpfun_cli.protocol.contracts import BUY_EXACT_SOL_IN_DISCRIMINATOR
+from pumpfun_cli.protocol.contracts import (
+    BUY_EXACT_SOL_IN_DISCRIMINATOR,
+    MAYHEM_GLOBAL_PARAMS,
+    MAYHEM_PROGRAM_ID,
+    MAYHEM_SOL_VAULT,
+)
 from pumpfun_cli.protocol.idl_parser import IDLParser
 from pumpfun_cli.protocol.instructions import (
     build_buy_exact_sol_in_instructions,
     build_buy_instructions,
+    build_create_instructions,
     build_sell_instructions,
 )
 
+# create_v2 must always have exactly 16 accounts (including mayhem accounts).
+_EXPECTED_CREATE_V2_ACCOUNTS = 16
+
 IDL_PATH = Path(__file__).parent.parent.parent / "idl" / "pump_fun_idl.json"
 _MINT = Pubkey.from_string("EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v")
 _USER = Pubkey.from_string("11111111111111111111111111111112")
@@ -85,8 +94,6 @@ def test_buy_exact_sol_in_discriminator():
 
 def test_create_instructions_cashback_false():
     """create_v2 with is_cashback=False encodes OptionBool as 0x00."""
-    from pumpfun_cli.protocol.instructions import build_create_instructions
-
     idl = IDLParser(str(IDL_PATH))
     ixs = build_create_instructions(
         idl=idl,
@@ -100,6 +107,11 @@ def test_create_instructions_cashback_false():
     )
     assert len(ixs) == 1
     create_ix = ixs[0]
+    # Lock account layout to prevent AccountNotEnoughKeys regressions
+    assert len(create_ix.accounts) == _EXPECTED_CREATE_V2_ACCOUNTS
+    assert create_ix.accounts[9].pubkey == MAYHEM_PROGRAM_ID
+    assert create_ix.accounts[10].pubkey == MAYHEM_GLOBAL_PARAMS
+    assert create_ix.accounts[11].pubkey == MAYHEM_SOL_VAULT
     # Last byte should be 0x00 (is_cashback_enabled = false)
     assert create_ix.data[-1:] == b"\x00"
     # Second-to-last byte is is_mayhem_mode = false
@@ -108,8 +120,6 @@ def test_create_instructions_cashback_false():
 
 def test_create_instructions_cashback_true():
     """create_v2 with is_cashback=True encodes OptionBool as 0x01."""
-    from pumpfun_cli.protocol.instructions import build_create_instructions
-
     idl = IDLParser(str(IDL_PATH))
     ixs = build_create_instructions(
         idl=idl,
@@ -123,6 +133,10 @@ def test_create_instructions_cashback_true():
     )
     assert len(ixs) == 1
     create_ix = ixs[0]
+    assert len(create_ix.accounts) == _EXPECTED_CREATE_V2_ACCOUNTS
+    assert create_ix.accounts[9].pubkey == MAYHEM_PROGRAM_ID
+    assert create_ix.accounts[10].pubkey == MAYHEM_GLOBAL_PARAMS
+    assert create_ix.accounts[11].pubkey == MAYHEM_SOL_VAULT
     # Last byte should be 0x01 (is_cashback_enabled = true)
     assert create_ix.data[-1:] == b"\x01"
     # Second-to-last byte is is_mayhem_mode = false
@@ -131,8 +145,6 @@ def test_create_instructions_cashback_true():
 
 def test_create_instructions_mayhem_and_cashback():
     """create_v2 with both is_mayhem=True and is_cashback=True."""
-    from pumpfun_cli.protocol.instructions import build_create_instructions
-
     idl = IDLParser(str(IDL_PATH))
     ixs = build_create_instructions(
         idl=idl,
@@ -146,6 +158,10 @@ def test_create_instructions_mayhem_and_cashback():
     )
     assert len(ixs) == 1
     create_ix = ixs[0]
+    assert len(create_ix.accounts) == _EXPECTED_CREATE_V2_ACCOUNTS
+    assert create_ix.accounts[9].pubkey == MAYHEM_PROGRAM_ID
+    assert create_ix.accounts[10].pubkey == MAYHEM_GLOBAL_PARAMS
+    assert create_ix.accounts[11].pubkey == MAYHEM_SOL_VAULT
     # Last byte = cashback true, second-to-last = mayhem true
     assert create_ix.data[-1:] == b"\x01"
     assert create_ix.data[-2:-1] == b"\x01"

tests/test_surfpool/test_launch.py

@@ -24,208 +24,58 @@
     return_value=FAKE_URI,
 )
 
-
-# ── mayhem=False, cashback=False (default) ──────────────────────────────
-
-
-@pytest.mark.asyncio
-@_UPLOAD_PATCH
-async def test_launch_default(
-    _mock_upload, surfpool_rpc, funded_keypair, test_keystore, test_password
-):
-    """Launch with defaults: no mayhem, no cashback."""
-    result = await launch_token(
-        rpc_url=surfpool_rpc,
-        keystore_path=str(test_keystore),
-        password=test_password,
-        name="Default",
-        ticker="DFLT",
-        description="default launch",
-    )
-
-    assert "error" not in result, f"Launch failed: {result}"
-    assert result["action"] == "launch"
-    assert result["is_cashback"] is False
-    assert result["signature"]
-
-    info = await get_token_info(surfpool_rpc, result["mint"])
-    assert "error" not in info, f"Token not found: {info}"
-    assert info["graduated"] is False
-
-
-# ── mayhem=False, cashback=True ─────────────────────────────────────────
+_LAUNCH_MATRIX = [
+    pytest.param(False, False, None, id="default"),
+    pytest.param(False, True, None, id="cashback"),
+    pytest.param(True, False, None, id="mayhem"),
+    pytest.param(True, True, None, id="mayhem+cashback"),
+    pytest.param(False, False, 0.001, id="default+buy"),
+    pytest.param(False, True, 0.001, id="cashback+buy"),
+    pytest.param(True, False, 0.001, id="mayhem+buy"),
+    pytest.param(True, True, 0.001, id="mayhem+cashback+buy"),
+]
 
 
 @pytest.mark.asyncio
+@pytest.mark.parametrize("is_mayhem,is_cashback,initial_buy_sol", _LAUNCH_MATRIX)
 @_UPLOAD_PATCH
-async def test_launch_cashback(
-    _mock_upload, surfpool_rpc, funded_keypair, test_keystore, test_password
+async def test_launch(
+    _mock_upload,
+    surfpool_rpc,
+    funded_keypair,
+    test_keystore,
+    test_password,
+    is_mayhem,
+    is_cashback,
+    initial_buy_sol,
 ):
-    """Launch with cashback enabled, no mayhem."""
-    result = await launch_token(
-        rpc_url=surfpool_rpc,
-        keystore_path=str(test_keystore),
-        password=test_password,
-        name="Cashback",
-        ticker="CSHB",
-        description="cashback launch",
-        is_cashback=True,
-    )
-
-    assert "error" not in result, f"Launch failed: {result}"
-    assert result["is_cashback"] is True
-    assert result["signature"]
-
-    info = await get_token_info(surfpool_rpc, result["mint"])
-    assert "error" not in info, f"Token not found: {info}"
-    assert info["graduated"] is False
-
-
-# ── mayhem=True, cashback=False ─────────────────────────────────────────
+    """Launch token with given mayhem/cashback/buy combination."""
+    kwargs = {}
+    if is_mayhem:
+        kwargs["is_mayhem"] = True
+    if is_cashback:
+        kwargs["is_cashback"] = True
+    if initial_buy_sol is not None:
+        kwargs["initial_buy_sol"] = initial_buy_sol
 
-
-@pytest.mark.asyncio
-@_UPLOAD_PATCH
-async def test_launch_mayhem(
-    _mock_upload, surfpool_rpc, funded_keypair, test_keystore, test_password
-):
-    """Launch with mayhem enabled, no cashback."""
     result = await launch_token(
         rpc_url=surfpool_rpc,
         keystore_path=str(test_keystore),
         password=test_password,
-        name="Mayhem",
-        ticker="MYHM",
-        description="mayhem launch",
-        is_mayhem=True,
+        name="Test",
+        ticker="TST",
+        description="parametrized launch",
+        **kwargs,
     )
 
     assert "error" not in result, f"Launch failed: {result}"
-    assert result["is_cashback"] is False
+    assert result["action"] == "launch"
+    assert result["is_cashback"] is is_cashback
     assert result["signature"]
 
-    info = await get_token_info(surfpool_rpc, result["mint"])
-    assert "error" not in info, f"Token not found: {info}"
-    assert info["graduated"] is False
-
-
-# ── mayhem=True, cashback=True ──────────────────────────────────────────
-
-
-@pytest.mark.asyncio
-@_UPLOAD_PATCH
-async def test_launch_mayhem_cashback(
-    _mock_upload, surfpool_rpc, funded_keypair, test_keystore, test_password
-):
-    """Launch with both mayhem and cashback enabled."""
-    result = await launch_token(
-        rpc_url=surfpool_rpc,
-        keystore_path=str(test_keystore),
-        password=test_password,
-        name="MayhemCB",
-        ticker="MHCB",
-        description="mayhem + cashback launch",
-        is_mayhem=True,
-        is_cashback=True,
-    )
-
-    assert "error" not in result, f"Launch failed: {result}"
-    assert result["is_cashback"] is True
-    assert result["signature"]
+    if initial_buy_sol is not None:
+        assert result["initial_buy_sol"] == initial_buy_sol
 
     info = await get_token_info(surfpool_rpc, result["mint"])
     assert "error" not in info, f"Token not found: {info}"
     assert info["graduated"] is False
-
-
-# ── with initial buy ────────────────────────────────────────────────────
-
-
-@pytest.mark.asyncio
-@_UPLOAD_PATCH
-async def test_launch_default_with_buy(
-    _mock_upload, surfpool_rpc, funded_keypair, test_keystore, test_password
-):
-    """Launch with initial buy, no mayhem, no cashback."""
-    result = await launch_token(
-        rpc_url=surfpool_rpc,
-        keystore_path=str(test_keystore),
-        password=test_password,
-        name="DefBuy",
-        ticker="DBUY",
-        description="default + buy",
-        initial_buy_sol=0.001,
-    )
-
-    assert "error" not in result, f"Launch failed: {result}"
-    assert result["initial_buy_sol"] == 0.001
-    assert result["signature"]
-
-
-@pytest.mark.asyncio
-@_UPLOAD_PATCH
-async def test_launch_cashback_with_buy(
-    _mock_upload, surfpool_rpc, funded_keypair, test_keystore, test_password
-):
-    """Launch cashback token with initial buy."""
-    result = await launch_token(
-        rpc_url=surfpool_rpc,
-        keystore_path=str(test_keystore),
-        password=test_password,
-        name="CashBuy",
-        ticker="CBUY",
-        description="cashback + buy",
-        is_cashback=True,
-        initial_buy_sol=0.001,
-    )
-
-    assert "error" not in result, f"Launch failed: {result}"
-    assert result["is_cashback"] is True
-    assert result["initial_buy_sol"] == 0.001
-    assert result["signature"]
-
-
-@pytest.mark.asyncio
-@_UPLOAD_PATCH
-async def test_launch_mayhem_with_buy(
-    _mock_upload, surfpool_rpc, funded_keypair, test_keystore, test_password
-):
-    """Launch mayhem token with initial buy."""
-    result = await launch_token(
-        rpc_url=surfpool_rpc,
-        keystore_path=str(test_keystore),
-        password=test_password,
-        name="MyhBuy",
-        ticker="MBUY",
-        description="mayhem + buy",
-        is_mayhem=True,
-        initial_buy_sol=0.001,
-    )
-
-    assert "error" not in result, f"Launch failed: {result}"
-    assert result["initial_buy_sol"] == 0.001
-    assert result["signature"]
-
-
-@pytest.mark.asyncio
-@_UPLOAD_PATCH
-async def test_launch_mayhem_cashback_with_buy(
-    _mock_upload, surfpool_rpc, funded_keypair, test_keystore, test_password
-):
-    """Launch mayhem + cashback token with initial buy."""
-    result = await launch_token(
-        rpc_url=surfpool_rpc,
-        keystore_path=str(test_keystore),
-        password=test_password,
-        name="MhCbBuy",
-        ticker="MCBB",
-        description="mayhem + cashback + buy",
-        is_mayhem=True,
-        is_cashback=True,
-        initial_buy_sol=0.001,
-    )
-
-    assert "error" not in result, f"Launch failed: {result}"
-    assert result["is_cashback"] is True
-    assert result["initial_buy_sol"] == 0.001
-    assert result["signature"]