Fixed TokenAccount to be able to find or create the associated token account, or use an old-style account if it exists and the associated token account doesn't.
This commit is contained in:
Geoff Taylor
parent
6a61b55e93
commit
b408874a2a
11
bin/mint
11
bin/mint
|
|
@ -11,7 +11,6 @@ from decimal import Decimal
|
|||
from spl.token.client import Token as SplToken
|
||||
from spl.token.constants import TOKEN_PROGRAM_ID
|
||||
from solana.publickey import PublicKey
|
||||
from spl.token.instructions import get_associated_token_address
|
||||
|
||||
sys.path.insert(0, os.path.abspath(
|
||||
os.path.join(os.path.dirname(__file__), '..')))
|
||||
|
|
@ -45,14 +44,8 @@ if account_info is None:
|
|||
|
||||
if account_info.owner == mango.SYSTEM_PROGRAM_ADDRESS:
|
||||
# This is a root wallet account - get the associated token account
|
||||
associated_token_address = get_associated_token_address(args.address, token.mint)
|
||||
token_account: typing.Optional[mango.TokenAccount] = mango.TokenAccount.load(context, associated_token_address)
|
||||
if token_account is None:
|
||||
# There is no associated token account, so create it
|
||||
destination = spl_token.create_associated_token_account(args.address)
|
||||
else:
|
||||
# The associated token account exists so use it as the destination
|
||||
destination = associated_token_address
|
||||
destination: PublicKey = mango.TokenAccount.find_or_create_token_address_to_use(
|
||||
context, wallet, args.address, token)
|
||||
|
||||
quantity = token.shift_to_native(args.quantity)
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ import logging
|
|||
import os
|
||||
import os.path
|
||||
import sys
|
||||
import traceback
|
||||
import typing
|
||||
|
||||
from decimal import Decimal
|
||||
|
|
@ -26,6 +25,8 @@ parser.add_argument("--symbol", type=str, required=True, help="token symbol to s
|
|||
parser.add_argument("--address", type=PublicKey,
|
||||
help="Destination address for the SPL token - can be either the actual token address or the address of the owner of the token address")
|
||||
parser.add_argument("--quantity", type=Decimal, required=True, help="quantity of token to send")
|
||||
parser.add_argument("--wait", action="store_true", default=False,
|
||||
help="wait until the transaction is confirmed")
|
||||
parser.add_argument("--dry-run", action="store_true", default=False,
|
||||
help="runs as read-only and does not perform any transactions")
|
||||
args = parser.parse_args()
|
||||
|
|
@ -33,57 +34,52 @@ args = parser.parse_args()
|
|||
logging.getLogger().setLevel(args.log_level)
|
||||
logging.warning(mango.WARNING_DISCLAIMER_TEXT)
|
||||
|
||||
try:
|
||||
context = mango.ContextBuilder.from_command_line_parameters(args)
|
||||
wallet = mango.Wallet.from_command_line_parameters_or_raise(args)
|
||||
context = mango.ContextBuilder.from_command_line_parameters(args)
|
||||
wallet = mango.Wallet.from_command_line_parameters_or_raise(args)
|
||||
|
||||
logging.info(f"Context: {context}")
|
||||
logging.info(f"Wallet address: {wallet.address}")
|
||||
logging.info(f"Context: {context}")
|
||||
logging.info(f"Wallet address: {wallet.address}")
|
||||
|
||||
token = context.token_lookup.find_by_symbol(args.symbol.upper())
|
||||
if token is None:
|
||||
raise Exception(f"Could not find details of token with symbol {args.symbol}.")
|
||||
token = context.token_lookup.find_by_symbol(args.symbol.upper())
|
||||
if token is None:
|
||||
raise Exception(f"Could not find details of token with symbol {args.symbol}.")
|
||||
|
||||
spl_token = Token(context.client.compatible_client, token.mint, TOKEN_PROGRAM_ID, wallet.account)
|
||||
source_accounts = spl_token.get_accounts(wallet.address)
|
||||
source_account = source_accounts["result"]["value"][0]
|
||||
source = PublicKey(source_account["pubkey"])
|
||||
spl_token = Token(context.client.compatible_client, token.mint, TOKEN_PROGRAM_ID, wallet.account)
|
||||
source_accounts = spl_token.get_accounts(wallet.address)
|
||||
source_account = source_accounts["result"]["value"][0]
|
||||
source = PublicKey(source_account["pubkey"])
|
||||
|
||||
# Is the address an actual token account? Or is it the SOL address of the owner?
|
||||
possible_dest: typing.Optional[mango.TokenAccount] = mango.TokenAccount.load(context, args.address)
|
||||
if (possible_dest is not None) and (possible_dest.value.token.mint == token.mint):
|
||||
# We successfully loaded the token account.
|
||||
destination: PublicKey = args.address
|
||||
else:
|
||||
destination_accounts = spl_token.get_accounts(args.address)
|
||||
if len(destination_accounts["result"]["value"]) == 0:
|
||||
raise Exception(
|
||||
f"Could not find destination account using {args.address} as either owner address or token address.")
|
||||
destination_account = destination_accounts["result"]["value"][0]
|
||||
destination = PublicKey(destination_account["pubkey"])
|
||||
# Is the address an actual token account? Or is it the SOL address of the owner?
|
||||
account_info: typing.Optional[mango.AccountInfo] = mango.AccountInfo.load(context, args.address)
|
||||
if account_info is None:
|
||||
raise Exception(f"Could not find account at address {args.address}.")
|
||||
|
||||
owner = wallet.account
|
||||
amount = int(args.quantity * Decimal(10 ** token.decimals))
|
||||
if account_info.owner == mango.SYSTEM_PROGRAM_ADDRESS:
|
||||
# This is a root wallet account - get the token account to use.
|
||||
destination: PublicKey = mango.TokenAccount.find_or_create_token_address_to_use(
|
||||
context, wallet, args.address, token)
|
||||
|
||||
print("Balance:", source_account["account"]["data"]["parsed"]
|
||||
["info"]["tokenAmount"]["uiAmountString"], token.name)
|
||||
text_amount = f"{amount} {token.name} (@ {token.decimals} decimal places)"
|
||||
print(f"Sending {text_amount}")
|
||||
print(f" From: {source}")
|
||||
print(f" To: {destination}")
|
||||
owner = wallet.account
|
||||
amount = int(args.quantity * Decimal(10 ** token.decimals))
|
||||
|
||||
if args.dry_run:
|
||||
print("Skipping actual transfer - dry run.")
|
||||
else:
|
||||
transfer_response = spl_token.transfer(source, destination, owner, amount)
|
||||
transaction_ids = transfer_response["result"]
|
||||
print(f"Waiting on transaction ID: {transaction_ids}")
|
||||
print("Balance:", source_account["account"]["data"]["parsed"]
|
||||
["info"]["tokenAmount"]["uiAmountString"], token.name)
|
||||
text_amount = f"{amount} {token.name} (@ {token.decimals} decimal places)"
|
||||
print(f"Sending {text_amount}")
|
||||
print(f" From: {source}")
|
||||
print(f" To: {destination}")
|
||||
|
||||
if args.dry_run:
|
||||
print("Skipping actual transfer - dry run.")
|
||||
else:
|
||||
transfer_response = spl_token.transfer(source, destination, owner, amount)
|
||||
transaction_ids = [transfer_response["result"]]
|
||||
print(f"Transaction IDs: {transaction_ids}")
|
||||
if args.wait:
|
||||
context.client.wait_for_confirmation(transaction_ids)
|
||||
|
||||
updated_balance = spl_token.get_balance(source)
|
||||
updated_balance_text = updated_balance["result"]["value"]["uiAmountString"]
|
||||
print(f"{text_amount} sent. Balance now: {updated_balance_text} {token.name}")
|
||||
except Exception as exception:
|
||||
logging.critical(f"send-token stopped because of exception: {exception} - {traceback.format_exc()}")
|
||||
except:
|
||||
logging.critical(f"send-token stopped because of uncatchable error: {traceback.format_exc()}")
|
||||
updated_balance = spl_token.get_balance(source)
|
||||
updated_balance_text = updated_balance["result"]["value"]["uiAmountString"]
|
||||
print(f"{text_amount} sent. Balance now: {updated_balance_text} {token.name}")
|
||||
else:
|
||||
print(f"{text_amount} sent.")
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@ from solana.publickey import PublicKey
|
|||
from solana.rpc.types import TokenAccountOpts
|
||||
from spl.token.client import Token as SplToken
|
||||
from spl.token.constants import TOKEN_PROGRAM_ID
|
||||
from spl.token.instructions import get_associated_token_address
|
||||
|
||||
from .accountinfo import AccountInfo
|
||||
from .addressableaccount import AddressableAccount
|
||||
|
|
@ -30,6 +31,7 @@ from .token import Token
|
|||
from .tokenlookup import TokenLookup
|
||||
from .tokenvalue import TokenValue
|
||||
from .version import Version
|
||||
from .wallet import Wallet
|
||||
|
||||
# # 🥭 TokenAccount class
|
||||
#
|
||||
|
|
@ -89,6 +91,25 @@ class TokenAccount(AddressableAccount):
|
|||
|
||||
return largest_account
|
||||
|
||||
@staticmethod
|
||||
def find_or_create_token_address_to_use(context: Context, wallet: Wallet, owner: PublicKey, token: Token) -> PublicKey:
|
||||
# This is a root wallet account - get the token account to use.
|
||||
associated_token_address = get_associated_token_address(owner, token.mint)
|
||||
token_account: typing.Optional[TokenAccount] = TokenAccount.load(context, associated_token_address)
|
||||
if token_account is None:
|
||||
# There is no associated token account. See if they have an old-style non-associated token account.
|
||||
largest = TokenAccount.fetch_largest_for_owner_and_token(context, owner, token)
|
||||
if largest is not None:
|
||||
# There is an old-style account so use that.
|
||||
return largest.address
|
||||
|
||||
# There is no old-style token account either, so create the proper associated token account.
|
||||
spl_token = SplToken(context.client.compatible_client, token.mint, TOKEN_PROGRAM_ID, wallet.account)
|
||||
return spl_token.create_associated_token_account(owner)
|
||||
else:
|
||||
# The associated token account exists so use it
|
||||
return associated_token_address
|
||||
|
||||
@staticmethod
|
||||
def from_layout(layout: layouts.TOKEN_ACCOUNT, account_info: AccountInfo, token: Token) -> "TokenAccount":
|
||||
token_value = TokenValue(token, token.shift_to_decimals(layout.amount))
|
||||
|
|
|
|||
Loading…
Reference in New Issue