Merge pull request #161 from kevinheavey/remove-old-transaction

Author: kevinheavey

docs/clientgen/index.md

@@ -77,14 +77,18 @@ This will generate code to `./my_client`:
 ### Instructions
 
 ```python
-from solana.transaction import Transaction
+from solders.hash import Hash
 from solders.keypair import Keypair
+from solders.message import Message
 from solders.pubkey import Pubkey
+from solders.transaction import Transaction
 from anchorpy import Provider
 from my_client.instructions import some_instruction
 
  # call an instruction
 foo_account = Keypair()
+# in real use, fetch this from an RPC
+recent_blockhash = Hash.default() 
 
 ix = some_instruction({
   "foo_param": "...",
@@ -95,11 +99,12 @@ ix = some_instruction({
   "bar_account": Pubkey("..."),
   ...
 })
-tx = Transaction().add(ix)
+msg = Message(instructions=[instruction], payer=payer.pubkey())
+tx = Transaction([payer], msg, recent_blockhash)
 
 provider = Provider.local()
 
-await provider.send(tx, [payer, foo_account])
+await provider.send(tx)
 ```
 
 ### Accounts

docs/dynamic_client/api_reference.md

@@ -6,7 +6,6 @@
 :::anchorpy.Context
 :::anchorpy.create_workspace
 :::anchorpy.close_workspace
-:::anchorpy.bankrun_fixture
 :::anchorpy.workspace_fixture
 :::anchorpy.localnet_fixture
 :::anchorpy.Wallet

docs/testing/index.md

@@ -185,18 +185,3 @@ Then run `anchor test` and voila!.
 
 !!! note
     You must have `pytest-asyncio` installed for `test_basic_1.py` to work.
-
-## Bankrun Integration
-
-AnchorPy comes with a `bankrun_fixture` to help use
-[`solders.bankrun`](https://kevinheavey.github.io/solders/examples/bankrun.html) in tests.
-
-If you haven't heard, `bankrun` is a much faster and more convenient alternative to
-`solana-test-validator`. Long test suites are about 40 times faster with `bankrun`,
-and for short test suites the difference is even bigger because `bankrun` has neglible
-startup time.
-
-`bankrun_fixture` calls `bankrun.start()` and deploys all the programs in the current
-Anchor workspace to the test envioronment.
-Check out [this example](https://github.com/kevinheavey/anchorpy/blob/main/tests/test_basic_3_bankrun.py).
-

pyproject.toml

@@ -7,7 +7,7 @@ requires-python = "~=3.9"
 readme = "README.md"
 dependencies = [
     "construct-typing>=0.5.1,<0.6",
-    "solana>=0.33.0,<1.0",
+    "solana>=0.36.1,<1.0",
     "solders>=0.21.0,<1.0",
     "borsh-construct>=0.1.0,<0.2",
     "toolz>=0.11.2,<0.12",

src/anchorpy/__init__.py

@@ -23,7 +23,6 @@
 __has_pytest = False
 with __suppress(ImportError):
     from anchorpy.pytest_plugin import (
-        bankrun_fixture,
         localnet_fixture,
         workspace_fixture,
     )
@@ -59,7 +58,6 @@
 __all__ = (
     [
         *__all_core,
-        "bankrun_fixture",
         "localnet_fixture",
         "workspace_fixture",
     ]

src/anchorpy/program/namespace/account.py

@@ -7,7 +7,7 @@
 from construct import Container
 from solana.rpc.commitment import Commitment
 from solana.rpc.types import MemcmpOpts
-from solana.transaction import Instruction
+from solders.instruction import Instruction
 from solders.keypair import Keypair
 from solders.pubkey import Pubkey
 from solders.system_program import CreateAccountParams, create_account

src/anchorpy/provider.py

@@ -10,12 +10,11 @@
 from solana.rpc import types
 from solana.rpc.async_api import AsyncClient
 from solana.rpc.commitment import Confirmed, Finalized, Processed
-from solana.transaction import Transaction
 from solders.keypair import Keypair
 from solders.pubkey import Pubkey
 from solders.rpc.responses import SimulateTransactionResp
 from solders.signature import Signature
-from solders.transaction import VersionedTransaction
+from solders.transaction import Transaction, VersionedTransaction
 
 DEFAULT_OPTIONS = types.TxOpts(skip_confirmation=False, preflight_commitment=Processed)
 COMMITMENT_RANKS = MappingProxyType({Processed: 0, Confirmed: 1, Finalized: 2})
@@ -118,7 +117,7 @@ async def send(
         """
         if opts is None:
             opts = self.opts
-        raw = tx.serialize() if isinstance(tx, Transaction) else bytes(tx)
+        raw = bytes(tx)
         resp = await self.connection.send_raw_transaction(raw, opts=opts)
         return resp.value
 
@@ -140,7 +139,7 @@ async def send_all(
             opts = self.opts
         sigs = []
         for tx in txs:
-            raw = tx.serialize() if isinstance(tx, Transaction) else bytes(tx)
+            raw = bytes(tx)
             resp = await self.connection.send_raw_transaction(raw, opts=opts)
             sigs.append(resp.value)
         return sigs
@@ -184,7 +183,7 @@ def sign_transaction(self, tx: Transaction) -> Transaction:
         Returns:
             The signed transaction.
         """
-        tx.sign(self.payer)
+        tx.sign([self.payer], tx.message.recent_blockhash)
         return tx
 
     def sign_all_transactions(self, txs: list[Transaction]) -> list[Transaction]:
@@ -197,7 +196,7 @@ def sign_all_transactions(self, txs: list[Transaction]) -> list[Transaction]:
             The signed transactions.
         """
         for tx in txs:
-            tx.sign_partial(self.payer)
+            tx.partial_sign([self.payer], tx.message.recent_blockhash)
         return txs
 
     @classmethod

src/anchorpy/pytest_plugin.py

@@ -2,23 +2,17 @@
 import os
 import signal
 import subprocess
-from contextlib import suppress
 from pathlib import Path
-from typing import AsyncGenerator, Callable, Literal, Optional, Sequence, Tuple, Union
+from typing import AsyncGenerator, Callable, Literal, Optional, Union
 
 from pytest import fixture
 from pytest_asyncio import fixture as async_fixture
 from pytest_xprocess import getrootdir
-from solders.account import Account
-from solders.pubkey import Pubkey
 from xprocess import ProcessStarter, XProcess, XProcessInfo
 
 from anchorpy.program.core import Program
 from anchorpy.workspace import close_workspace, create_workspace
 
-with suppress(ImportError):
-    from solders import bankrun
-
 _Scope = Literal["session", "package", "module", "class", "function"]
 
 
@@ -240,57 +234,3 @@ class Starter(ProcessStarter):
         _fixed_xprocess.getinfo("localnet").terminate()
 
     return _workspace_fixture
-
-
-async def _bankrun_helper(
-    path: Union[Path, str],
-    build_cmd: Optional[str] = None,
-    accounts: Optional[Sequence[Tuple[Pubkey, Account]]] = None,
-    compute_max_units: Optional[int] = None,
-    transaction_account_lock_limit: Optional[int] = None,
-) -> "bankrun.ProgramTestContext":
-    actual_build_cmd = "anchor build" if build_cmd is None else build_cmd
-    subprocess.run(actual_build_cmd, cwd=path, check=True, shell=True)
-    path_to_use = Path(path)
-    return await bankrun.start_anchor(
-        path_to_use,
-        accounts=accounts,
-        compute_max_units=compute_max_units,
-        transaction_account_lock_limit=transaction_account_lock_limit,
-    )
-
-
-def bankrun_fixture(
-    path: Union[Path, str],
-    scope: _Scope = "module",
-    build_cmd: Optional[str] = None,
-    accounts: Optional[Sequence[Tuple[Pubkey, Account]]] = None,
-    compute_max_units: Optional[int] = None,
-    transaction_account_lock_limit: Optional[int] = None,
-) -> "bankrun.ProgramTestContext":
-    """Create a fixture that builds the project and starts a bankrun with all the programs in the workspace deployed.
-
-    Args:
-        path: Path to root of the Anchor project.
-        scope: Pytest fixture scope.
-        build_cmd: Command to build the project. Defaults to `anchor build`.
-        accounts: A sequence of (address, account_object) tuples, indicating
-            what data to write to the given addresses.
-        compute_max_units: Override the default compute unit limit for a transaction.
-        transaction_account_lock_limit: Override the default transaction account lock limit.
-
-    Returns:
-        A bankrun fixture for use with pytest.
-    """  # noqa: E501,D202
-
-    @async_fixture(scope=scope)
-    async def _bankrun_fixture() -> bankrun.ProgramTestContext:
-        return await _bankrun_helper(
-            path,
-            build_cmd,
-            accounts,
-            compute_max_units,
-            transaction_account_lock_limit,
-        )
-
-    return _bankrun_fixture

src/anchorpy/utils/rpc.py

@@ -6,21 +6,15 @@
 from solana.rpc.async_api import AsyncClient
 from solana.rpc.commitment import Commitment, Confirmed, Finalized, Processed
 from solana.rpc.core import RPCException
-from solana.transaction import Transaction
 from solders.account import Account
 from solders.account_decoder import UiAccountEncoding
 from solders.commitment_config import CommitmentLevel
-from solders.instruction import AccountMeta, Instruction
 from solders.pubkey import Pubkey
 from solders.rpc.config import RpcAccountInfoConfig
 from solders.rpc.requests import GetMultipleAccounts, batch_to_json
 from solders.rpc.responses import GetMultipleAccountsResp, RPCError, batch_from_json
-from solders.signature import Signature
 from toolz import concat, partition_all
 
-from anchorpy.program.common import AddressType, translate_address
-from anchorpy.provider import Provider
-
 _GET_MULTIPLE_ACCOUNTS_LIMIT = 100
 _MAX_ACCOUNT_SIZE = 10 * 1048576
 
@@ -48,36 +42,6 @@ class AccountInfo(NamedTuple):
     data: bytes
     rent_epoch: Optional[int]
 
-
-async def invoke(
-    program_id: AddressType,
-    provider: Provider,
-    accounts: Optional[list[AccountMeta]] = None,
-    data: Optional[bytes] = None,
-) -> Signature:
-    """Send a transaction to a program with the given accounts and instruction data.
-
-    Args:
-        program_id: The program ID
-        provider: the `Provider` instance.
-        accounts: `AccountMeta` objects.
-        data: The transaction data.
-
-    Returns:
-        The transaction signature.
-    """
-    translated_program_id = translate_address(program_id)
-    tx = Transaction()
-    tx.add(
-        Instruction(
-            program_id=translated_program_id,
-            accounts=[] if accounts is None else accounts,
-            data=bytes(0) if data is None else data,
-        ),
-    )
-    return await provider.send(tx)
-
-
 @dataclass
 class _MultipleAccountsItem:
     pubkey: Pubkey

tests/unit/test_accounts_array.py

@@ -3,7 +3,7 @@
 from anchorpy import Idl
 from anchorpy.program.namespace.instruction import _accounts_array
 from pytest import mark
-from solana.transaction import AccountMeta
+from solders.instruction import AccountMeta
 from solders.keypair import Keypair