Skip to content

Commit ce13aa0

Browse files
alberto-crossmintalberto-crossmint
authored
Crossmint(SSW): Fixes (#438)
* SSW: improvements * oops
1 parent ef5f706 commit ce13aa0

11 files changed

+787
-366
lines changed

‎python/examples/by-wallet/crossmint/solana_smart_wallet_creation_examples.py

+88
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
"""
2+
This file contains examples of how to create a Solana Smart Wallet with different configurations and linked users.
3+
4+
To run these examples, you need to set the following environment variables:
5+
- CROSSMINT_API_KEY
6+
- SOLANA_RPC_ENDPOINT
7+
- CROSSMINT_BASE_URL
8+
"""
9+
10+
from goat_wallets.crossmint.solana_smart_wallet_factory import SolanaSmartWalletFactory
11+
from goat_wallets.crossmint.types import SolanaKeypairSigner, SolanaFireblocksSigner
12+
from goat_wallets.crossmint.solana_smart_wallet import SolanaSmartWalletConfig
13+
from goat_wallets.crossmint.solana_smart_wallet import SolanaSmartWalletClient
14+
from goat_wallets.crossmint.api_client import CrossmintWalletsAPI
15+
from solders.keypair import Keypair
16+
from goat_wallets.crossmint.parameters import CoreSignerType
17+
from typing import Literal, Optional
18+
from solana.rpc.api import Client as SolanaClient
19+
import os
20+
from dotenv import load_dotenv
21+
import uuid
22+
23+
load_dotenv()
24+
25+
26+
def create_wallet(factory: SolanaSmartWalletFactory, signer_type: Literal["solana-keypair", "solana-fireblocks-custodial"], linked_user: Optional[str] = None, idempotency_key: Optional[str] = None) -> SolanaSmartWalletClient:
27+
print("=" * 50)
28+
print(
29+
f"\n🔑 Creating Solana Smart Wallet {"idempotently" if idempotency_key or linked_user else ""} with {signer_type} admin signer and linked user {linked_user}...")
30+
print(f"Idempotency key: {idempotency_key}") if idempotency_key else None
31+
32+
config = SolanaSmartWalletConfig(
33+
adminSigner=SolanaKeypairSigner(
34+
type=CoreSignerType.SOLANA_KEYPAIR,
35+
keyPair=Keypair()
36+
) if signer_type == "solana-keypair" else SolanaFireblocksSigner(
37+
type=CoreSignerType.SOLANA_FIREBLOCKS_CUSTODIAL,
38+
)
39+
)
40+
params = {"config": config}
41+
if linked_user:
42+
params["linkedUser"] = linked_user
43+
wallet = factory.get_or_create(params, idempotency_key=idempotency_key)
44+
45+
print(f"✅ Wallet created successfully!")
46+
print(f"📝 Wallet Address: {wallet.get_address()}")
47+
print(
48+
f"👤 Admin Signer: {wallet.get_admin_signer_address()}. Type: {"MPC Custodial" if signer_type == "solana-fireblocks-custodial" else "Non-custodial"}")
49+
return wallet
50+
51+
52+
def main():
53+
print("🚀 Starting Solana Smart Wallet Creation Examples")
54+
api_key = os.getenv("CROSSMINT_API_KEY")
55+
base_url = os.getenv("CROSSMINT_BASE_URL", "https://staging.crossmint.com")
56+
rpc_url = os.getenv("SOLANA_RPC_ENDPOINT", "https://api.devnet.solana.com")
57+
if not api_key:
58+
raise ValueError("❌ CROSSMINT_API_KEY is required")
59+
60+
print("\n🔧 Initializing API client and connection...")
61+
api_client = CrossmintWalletsAPI(api_key, base_url=base_url)
62+
connection = SolanaClient(rpc_url)
63+
64+
print("\n🔧 Initializing factory...")
65+
factory = SolanaSmartWalletFactory(api_client, connection)
66+
67+
# Signer configurations
68+
create_wallet(factory, "solana-keypair")
69+
create_wallet(factory, "solana-fireblocks-custodial")
70+
71+
# Idempotency key configurations (both requests will return the same wallet)
72+
idempotency_key = str(uuid.uuid4())
73+
create_wallet(factory, "solana-fireblocks-custodial",
74+
idempotency_key=idempotency_key)
75+
create_wallet(factory, "solana-fireblocks-custodial",
76+
idempotency_key=idempotency_key)
77+
78+
# Linked user configurations. Creations with the same linked user will return the same wallet.
79+
create_wallet(factory, "solana-keypair", "email:example@example.com")
80+
create_wallet(factory, "solana-fireblocks-custodial",
81+
"phoneNumber:+1234567890")
82+
create_wallet(factory, "solana-keypair", "twitter:example")
83+
create_wallet(factory, "solana-fireblocks-custodial", "userId:1234567890")
84+
create_wallet(factory, "solana-keypair", "x:example")
85+
86+
87+
if __name__ == "__main__":
88+
main()

‎python/examples/by-wallet/crossmint/solana_smart_wallet_delegated_signer_example.py

+35-35
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010

1111
import os
1212
from goat_wallets.crossmint.solana_smart_wallet import SolanaSmartWalletClient
13-
from goat_wallets.crossmint.parameters import WalletType
1413
from goat_wallets.crossmint.parameters import CoreSignerType
15-
from goat_wallets.crossmint.parameters import AdminSigner
14+
from goat_wallets.crossmint.solana_smart_wallet_factory import SolanaSmartWalletFactory
15+
from goat_wallets.crossmint.types import SolanaKeypairSigner
16+
from goat_wallets.crossmint.solana_smart_wallet import SolanaSmartWalletConfig
1617
from solana.rpc.api import Client as SolanaClient
1718
from goat_wallets.crossmint.api_client import CrossmintWalletsAPI
18-
from goat_wallets.crossmint.solana_smart_wallet_factory import solana_smart_wallet_factory
1919
from solders.keypair import Keypair
2020
from dotenv import load_dotenv
2121
from solders.pubkey import Pubkey
@@ -24,94 +24,94 @@
2424

2525
load_dotenv()
2626

27+
2728
def create_memo_instruction(fee_payer: Pubkey, memo: str) -> Instruction:
28-
memo_program_id = Pubkey.from_string("MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr")
29-
accounts = [AccountMeta(pubkey=fee_payer, is_signer=False, is_writable=False)]
29+
memo_program_id = Pubkey.from_string(
30+
"MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr")
31+
accounts = [AccountMeta(
32+
pubkey=fee_payer, is_signer=False, is_writable=False)]
3033
data = bytes(memo, "utf-8")
3134
return Instruction(
3235
memo_program_id,
3336
data,
3437
accounts,
3538
)
3639

37-
def create_wallet(api_client: CrossmintWalletsAPI, connection: SolanaClient, signer: Keypair) -> SolanaSmartWalletClient:
40+
41+
def create_wallet(factory: SolanaSmartWalletFactory, signer: Keypair) -> SolanaSmartWalletClient:
3842
print("\n🔑 Creating Solana Smart Wallet...")
39-
wallet_creation_response = api_client.create_smart_wallet(
40-
WalletType.SOLANA_SMART_WALLET,
41-
AdminSigner(
43+
wallet = factory.get_or_create({
44+
"config": SolanaSmartWalletConfig(
45+
adminSigner=SolanaKeypairSigner(
4246
type=CoreSignerType.SOLANA_KEYPAIR,
43-
address=str(signer.pubkey())
44-
),
47+
keyPair=signer
48+
)
4549
)
50+
})
4651
print(f"✅ Wallet created successfully!")
47-
print(f"📝 Wallet Address: {wallet_creation_response['address']}")
52+
print(f"📝 Wallet Address: {wallet.get_address()}")
4853
print(f"👤 Admin Signer: {signer.pubkey()}")
49-
return SolanaSmartWalletClient(
50-
wallet_creation_response["address"],
51-
api_client,
52-
{
53-
"config": {
54-
"adminSigner": {
55-
"type": "solana-keypair",
56-
"keyPair": signer
57-
}
58-
}
59-
},
60-
connection=connection
61-
)
54+
return wallet
55+
6256

6357
def register_delegated_signer(wallet: SolanaSmartWalletClient, signer: Keypair) -> Pubkey:
6458
print("\n🔑 Registering delegated signer...")
6559
delegated_signer_response = wallet.register_delegated_signer(
6660
str(signer.pubkey())
6761
)
6862
print(f"✅ Delegated signer registered successfully!")
69-
print(f"📝 Delegated Signer Locator: {delegated_signer_response['locator']}")
63+
print(
64+
f"📝 Delegated Signer Locator: {delegated_signer_response['locator']}")
7065
print(f"👤 Delegated Signer Address: {signer.pubkey()}")
7166
return delegated_signer_response["locator"]
7267

68+
7369
def send_transaction(wallet: SolanaSmartWalletClient, signer: Keypair):
7470
print("\n💸 Preparing transaction...")
75-
transaction = create_memo_instruction(Pubkey.from_string(wallet.get_address()), "My first Solana Smart Wallet transaction! 🚀")
71+
instruction = create_memo_instruction(Pubkey.from_string(
72+
wallet.get_address()), "My first Solana Smart Wallet transaction! 🚀")
7673
print(f"📝 Transaction Details:")
7774
print(f" From: {wallet.get_address()}")
7875
print(f" Signer: {signer.pubkey()}")
7976
print(f" Message: My first Solana Smart Wallet transaction! 🚀")
80-
77+
8178
print("\n📤 Sending transaction to network...")
8279
transaction_response = wallet.send_transaction(
8380
{
84-
"instructions": [transaction],
81+
"instructions": [instruction],
8582
"signer": signer
8683
}
8784
)
8885
print(f"✅ Transaction sent successfully!")
8986
print(f"🔗 Transaction Hash: {transaction_response.get('hash')}")
9087

88+
9189
def main():
9290
print("🚀 Starting Solana Smart Wallet Delegated Signer Example")
9391
print("=" * 50)
94-
92+
9593
api_key = os.getenv("CROSSMINT_API_KEY")
9694
base_url = os.getenv("CROSSMINT_BASE_URL", "https://staging.crossmint.com")
9795
rpc_url = os.getenv("SOLANA_RPC_ENDPOINT", "https://api.devnet.solana.com")
9896
if not api_key:
9997
raise ValueError("❌ CROSSMINT_API_KEY is required")
100-
98+
10199
print("\n🔧 Initializing API client and connection...")
102100
api_client = CrossmintWalletsAPI(api_key, base_url=base_url)
103101
connection = SolanaClient(rpc_url)
104-
102+
105103
print("\n🔑 Generating keypairs...")
106104
admin_signer = Keypair()
107105
delegated_signer = Keypair()
108-
109-
wallet = create_wallet(api_client, connection, admin_signer)
106+
107+
factory = SolanaSmartWalletFactory(api_client, connection)
108+
wallet = create_wallet(factory, admin_signer)
110109
register_delegated_signer(wallet, delegated_signer)
111110
send_transaction(wallet, delegated_signer)
112-
111+
113112
print("\n✨ Example completed successfully!")
114113
print("=" * 50)
115114

115+
116116
if __name__ == "__main__":
117117
main()

‎python/examples/by-wallet/crossmint/solana_smart_wallet_fireblocks_signer_example.py

+29-27
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@
1010

1111
import os
1212
from goat_wallets.crossmint.solana_smart_wallet import SolanaSmartWalletClient
13-
from goat_wallets.crossmint.parameters import WalletType
1413
from goat_wallets.crossmint.parameters import CoreSignerType
15-
from goat_wallets.crossmint.parameters import AdminSigner
14+
from goat_wallets.crossmint.solana_smart_wallet_factory import SolanaSmartWalletFactory
15+
from goat_wallets.crossmint.types import SolanaFireblocksSigner
16+
from goat_wallets.crossmint.solana_smart_wallet import SolanaSmartWalletConfig
1617
from solana.rpc.api import Client as SolanaClient
1718
from goat_wallets.crossmint.api_client import CrossmintWalletsAPI
1819
from dotenv import load_dotenv
@@ -22,73 +23,74 @@
2223

2324
load_dotenv()
2425

26+
2527
def create_memo_instruction(fee_payer: Pubkey, memo: str) -> Instruction:
26-
memo_program_id = Pubkey.from_string("MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr")
27-
accounts = [AccountMeta(pubkey=fee_payer, is_signer=False, is_writable=False)]
28+
memo_program_id = Pubkey.from_string(
29+
"MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr")
30+
accounts = [AccountMeta(
31+
pubkey=fee_payer, is_signer=False, is_writable=False)]
2832
data = bytes(memo, "utf-8")
2933
return Instruction(
3034
memo_program_id,
3135
data,
3236
accounts,
3337
)
3438

35-
def create_wallet(api_client: CrossmintWalletsAPI, connection: SolanaClient
36-
) -> SolanaSmartWalletClient:
39+
40+
def create_wallet(factory: SolanaSmartWalletFactory) -> SolanaSmartWalletClient:
3741
print("\n🔑 Creating Solana Smart Wallet with Fireblocks custodial signer...")
38-
wallet_creation_response = api_client.create_smart_wallet(
39-
WalletType.SOLANA_SMART_WALLET,
40-
AdminSigner(
42+
wallet = factory.get_or_create({
43+
"config": SolanaSmartWalletConfig(
44+
adminSigner=SolanaFireblocksSigner(
4145
type=CoreSignerType.SOLANA_FIREBLOCKS_CUSTODIAL,
42-
),
46+
)
4347
)
44-
address = wallet_creation_response["address"]
48+
})
49+
4550
print(f"✅ Wallet created successfully!")
46-
print(f"📝 Wallet Address: {address}")
51+
print(f"📝 Wallet Address: {wallet.get_address()}")
4752
print(f"🔐 Signer Type: Fireblocks Custodial")
48-
return SolanaSmartWalletClient(
49-
address,
50-
api_client,
51-
{
52-
"config": {"adminSigner": {"type": "fireblocks"}},
53-
},
54-
connection=connection
55-
)
53+
return wallet
54+
5655

5756
def send_transaction(wallet: SolanaSmartWalletClient):
5857
print("\n💸 Preparing transaction...")
59-
transaction = create_memo_instruction(Pubkey.from_string(wallet.get_address()), "My first Solana Smart Wallet transaction! 🚀")
58+
instruction = create_memo_instruction(Pubkey.from_string(
59+
wallet.get_address()), "My first Solana Smart Wallet transaction! 🚀")
6060
print(f"📝 Transaction Details:")
6161
print(f" From: {wallet.get_address()}")
6262
print(f" Message: My first Solana Smart Wallet transaction! 🚀")
63-
63+
6464
print("\n📤 Sending transaction to network...")
6565
transaction_response = wallet.send_transaction(
6666
{
67-
"instructions": [transaction],
67+
"instructions": [instruction],
6868
}
6969
)
7070
print(f"✅ Transaction sent successfully!")
7171
print(f"🔗 Transaction Hash: {transaction_response.get('hash')}")
7272

73+
7374
def main():
7475
print("🚀 Starting Solana Smart Wallet Fireblocks Signer Example")
7576
print("=" * 50)
76-
77+
7778
api_key = os.getenv("CROSSMINT_API_KEY")
7879
base_url = os.getenv("CROSSMINT_BASE_URL", "https://staging.crossmint.com")
7980
rpc_url = os.getenv("SOLANA_RPC_ENDPOINT", "https://api.devnet.solana.com")
8081
if not api_key:
8182
raise ValueError("❌ CROSSMINT_API_KEY is required")
82-
83+
8384
print("\n🔧 Initializing API client and connection...")
8485
api_client = CrossmintWalletsAPI(api_key, base_url=base_url)
8586
connection = SolanaClient(rpc_url)
8687

87-
wallet = create_wallet(api_client, connection)
88+
wallet = create_wallet(SolanaSmartWalletFactory(api_client, connection))
8889
send_transaction(wallet)
89-
90+
9091
print("\n✨ Example completed successfully!")
9192
print("=" * 50)
9293

94+
9395
if __name__ == "__main__":
9496
main()

0 commit comments

Comments
 (0)