@reown/appkit-solana-react-native 0.0.0-feat-multichain-20250731180941 → 0.0.0-feat-multichain-20250804182547
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/commonjs/adapter.js +1 -2
- package/lib/commonjs/adapter.js.map +1 -1
- package/lib/commonjs/connectors/PhantomConnector.js +15 -13
- package/lib/commonjs/connectors/PhantomConnector.js.map +1 -1
- package/lib/module/adapter.js +1 -2
- package/lib/module/adapter.js.map +1 -1
- package/lib/module/connectors/PhantomConnector.js +15 -13
- package/lib/module/connectors/PhantomConnector.js.map +1 -1
- package/lib/typescript/adapter.d.ts +1 -3
- package/lib/typescript/adapter.d.ts.map +1 -1
- package/lib/typescript/connectors/PhantomConnector.d.ts.map +1 -1
- package/package.json +2 -2
- package/src/adapter.ts +1 -2
- package/src/connectors/PhantomConnector.ts +20 -26
package/lib/commonjs/adapter.js
CHANGED
|
@@ -12,9 +12,8 @@ var _createSendTransaction = require("./utils/createSendTransaction");
|
|
|
12
12
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
13
13
|
class SolanaAdapter extends _appkitCommonReactNative.SolanaBaseAdapter {
|
|
14
14
|
static supportedNamespace = 'solana';
|
|
15
|
-
constructor(
|
|
15
|
+
constructor() {
|
|
16
16
|
super({
|
|
17
|
-
projectId: configParams.projectId,
|
|
18
17
|
supportedNamespace: SolanaAdapter.supportedNamespace,
|
|
19
18
|
adapterType: 'solana'
|
|
20
19
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_appkitCommonReactNative","require","_helpers","_web","_bs","_interopRequireDefault","_createSendTransaction","e","__esModule","default","SolanaAdapter","SolanaBaseAdapter","supportedNamespace","constructor","
|
|
1
|
+
{"version":3,"names":["_appkitCommonReactNative","require","_helpers","_web","_bs","_interopRequireDefault","_createSendTransaction","e","__esModule","default","SolanaAdapter","SolanaBaseAdapter","supportedNamespace","constructor","adapterType","getBalance","params","network","address","tokens","connector","Error","balanceAddress","getAccounts","find","account","includes","id","toString","amount","symbol","rpcUrl","rpcUrls","http","base58Address","split","token","caipNetworkId","balance","getSolanaTokenBalance","getSolanaNativeBalance","emit","error","signTransaction","transaction","provider","getProvider","serializedTransaction","Buffer","from","Uint8Array","serialize","verifySignatures","result","request","method","pubkey","signature","decoded","base58","decode","Transaction","feePayer","addSignature","decodedTransaction","VersionedTransaction","deserialize","message","sendTransaction","data","fromAddress","toAddress","connectionRpcUrl","connection","Connection","createSendTransaction","value","signedTransaction","sendRawTransaction","skipPreflight","preflightCommitment","switchNetwork","switchError","namespaces","getNamespaces","getSupportedNamespace","accounts","disconnect","exports"],"sourceRoot":"../../src","sources":["adapter.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -9,10 +9,10 @@ var _tweetnacl = _interopRequireDefault(require("tweetnacl"));
|
|
|
9
9
|
var _bs = _interopRequireDefault(require("bs58"));
|
|
10
10
|
var _PhantomProvider = require("../providers/PhantomProvider");
|
|
11
11
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
12
|
-
const
|
|
13
|
-
'mainnet-beta': _appkitCommonReactNative.solana.
|
|
14
|
-
'testnet': _appkitCommonReactNative.solanaTestnet.
|
|
15
|
-
'devnet': _appkitCommonReactNative.solanaDevnet.
|
|
12
|
+
const SOLANA_CLUSTER_TO_CHAIN_ID = {
|
|
13
|
+
'mainnet-beta': _appkitCommonReactNative.solana.caipNetworkId,
|
|
14
|
+
'testnet': _appkitCommonReactNative.solanaTestnet.caipNetworkId,
|
|
15
|
+
'devnet': _appkitCommonReactNative.solanaDevnet.caipNetworkId
|
|
16
16
|
};
|
|
17
17
|
const PHANTOM_CONNECTOR_STORAGE_KEY = '@appkit/phantom-connector-data';
|
|
18
18
|
const DAPP_KEYPAIR_STORAGE_KEY = '@appkit/phantom-dapp-secret-key';
|
|
@@ -65,18 +65,20 @@ class PhantomConnector extends _appkitCommonReactNative.WalletConnector {
|
|
|
65
65
|
if (this.isConnected()) {
|
|
66
66
|
return this.namespaces;
|
|
67
67
|
}
|
|
68
|
-
const defaultChain = opts?.defaultChain?.split(':')?.[0] === 'solana' ? opts?.defaultChain
|
|
69
|
-
const requestedCluster = this.config.cluster ?? Object.keys(
|
|
68
|
+
const defaultChain = opts?.defaultChain?.split(':')?.[0] === 'solana' ? opts?.defaultChain : opts?.namespaces?.['solana']?.chains?.[0];
|
|
69
|
+
const requestedCluster = this.config.cluster ?? Object.keys(SOLANA_CLUSTER_TO_CHAIN_ID).find(key => SOLANA_CLUSTER_TO_CHAIN_ID[key] === defaultChain);
|
|
70
70
|
try {
|
|
71
71
|
const connectResult = await this.getProvider().connect({
|
|
72
72
|
cluster: requestedCluster
|
|
73
73
|
});
|
|
74
|
-
const
|
|
75
|
-
if (!
|
|
74
|
+
const solanaChainId = SOLANA_CLUSTER_TO_CHAIN_ID[connectResult.cluster];
|
|
75
|
+
if (!solanaChainId) {
|
|
76
76
|
throw new Error(`Phantom Connect: Internal - Unknown cluster mapping for ${connectResult.cluster}`);
|
|
77
77
|
}
|
|
78
|
-
this.currentCaipNetworkId =
|
|
79
|
-
this.wallet =
|
|
78
|
+
this.currentCaipNetworkId = solanaChainId;
|
|
79
|
+
this.wallet = {
|
|
80
|
+
name: _appkitCommonReactNative.ConstantsUtil.PHANTOM_CUSTOM_WALLET.name
|
|
81
|
+
};
|
|
80
82
|
const userPublicKey = this.getProvider().getUserPublicKey();
|
|
81
83
|
if (!userPublicKey) {
|
|
82
84
|
throw new Error('Phantom Connect: Provider failed to return a user public key.');
|
|
@@ -152,11 +154,11 @@ class PhantomConnector extends _appkitCommonReactNative.WalletConnector {
|
|
|
152
154
|
return this.getProvider().isConnected() && !!this.getProvider().getUserPublicKey();
|
|
153
155
|
}
|
|
154
156
|
async switchNetwork(network) {
|
|
155
|
-
const targetClusterName = Object.keys(
|
|
157
|
+
const targetClusterName = Object.keys(SOLANA_CLUSTER_TO_CHAIN_ID).find(key => SOLANA_CLUSTER_TO_CHAIN_ID[key] === network.caipNetworkId);
|
|
156
158
|
if (!targetClusterName) {
|
|
157
159
|
throw new Error(`Cannot switch to unsupported network ID: ${network.id}`);
|
|
158
160
|
}
|
|
159
|
-
const currentClusterName = Object.keys(
|
|
161
|
+
const currentClusterName = Object.keys(SOLANA_CLUSTER_TO_CHAIN_ID).find(key => SOLANA_CLUSTER_TO_CHAIN_ID[key] === this.currentCaipNetworkId);
|
|
160
162
|
if (targetClusterName === currentClusterName && this.isConnected()) {
|
|
161
163
|
return Promise.resolve();
|
|
162
164
|
}
|
|
@@ -166,7 +168,7 @@ class PhantomConnector extends _appkitCommonReactNative.WalletConnector {
|
|
|
166
168
|
|
|
167
169
|
// Create a temporary options object to guide the new connection
|
|
168
170
|
const tempConnectOpts = {
|
|
169
|
-
defaultChain:
|
|
171
|
+
defaultChain: SOLANA_CLUSTER_TO_CHAIN_ID[targetClusterName]
|
|
170
172
|
};
|
|
171
173
|
|
|
172
174
|
// Attempt to connect to the new cluster
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_appkitCommonReactNative","require","_tweetnacl","_interopRequireDefault","_bs","_PhantomProvider","e","__esModule","default","
|
|
1
|
+
{"version":3,"names":["_appkitCommonReactNative","require","_tweetnacl","_interopRequireDefault","_bs","_PhantomProvider","e","__esModule","default","SOLANA_CLUSTER_TO_CHAIN_ID","solana","caipNetworkId","solanaTestnet","solanaDevnet","PHANTOM_CONNECTOR_STORAGE_KEY","DAPP_KEYPAIR_STORAGE_KEY","PhantomConnector","WalletConnector","currentCaipNetworkId","SUPPORTED_NAMESPACE","constructor","config","type","cluster","init","ops","storage","initializeKeyPair","appScheme","metadata","redirect","universal","native","Error","providerConfig","dappUrl","url","dappEncryptionKeyPair","provider","PhantomProvider","restoreSession","secretKeyB58","getStorage","getItem","secretKey","bs58","decode","nacl","box","keyPair","fromSecretKey","newKeyPair","setItem","encode","error","disconnect","connect","opts","isConnected","namespaces","defaultChain","split","chains","requestedCluster","Object","keys","find","key","connectResult","getProvider","solanaChainId","wallet","name","ConstantsUtil","PHANTOM_CUSTOM_WALLET","userPublicKey","getUserPublicKey","caipAddress","accounts","methods","values","SOLANA_SIGNING_METHODS","events","saveSession","clearSession","undefined","clearSessionStorage","getNamespaces","getChainId","namespace","getProperties","properties","getWalletInfo","switchNetwork","network","targetClusterName","id","currentClusterName","Promise","resolve","tempConnectOpts","emit","providerSession","connectorData","removeItem","exports"],"sourceRoot":"../../../src","sources":["connectors/PhantomConnector.ts"],"mappings":"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","ignoreList":[]}
|
package/lib/module/adapter.js
CHANGED
|
@@ -7,9 +7,8 @@ import base58 from 'bs58';
|
|
|
7
7
|
import { createSendTransaction } from './utils/createSendTransaction';
|
|
8
8
|
export class SolanaAdapter extends SolanaBaseAdapter {
|
|
9
9
|
static supportedNamespace = 'solana';
|
|
10
|
-
constructor(
|
|
10
|
+
constructor() {
|
|
11
11
|
super({
|
|
12
|
-
projectId: configParams.projectId,
|
|
13
12
|
supportedNamespace: SolanaAdapter.supportedNamespace,
|
|
14
13
|
adapterType: 'solana'
|
|
15
14
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["SolanaBaseAdapter","getSolanaNativeBalance","getSolanaTokenBalance","Connection","Transaction","VersionedTransaction","base58","createSendTransaction","SolanaAdapter","supportedNamespace","constructor","
|
|
1
|
+
{"version":3,"names":["SolanaBaseAdapter","getSolanaNativeBalance","getSolanaTokenBalance","Connection","Transaction","VersionedTransaction","base58","createSendTransaction","SolanaAdapter","supportedNamespace","constructor","adapterType","getBalance","params","network","address","tokens","connector","Error","balanceAddress","getAccounts","find","account","includes","id","toString","amount","symbol","rpcUrl","rpcUrls","default","http","base58Address","split","token","caipNetworkId","balance","emit","error","signTransaction","transaction","provider","getProvider","serializedTransaction","Buffer","from","Uint8Array","serialize","verifySignatures","result","request","method","pubkey","signature","decoded","decode","feePayer","addSignature","decodedTransaction","deserialize","message","sendTransaction","data","fromAddress","toAddress","connectionRpcUrl","connection","value","signedTransaction","sendRawTransaction","skipPreflight","preflightCommitment","switchNetwork","switchError","namespaces","getNamespaces","getSupportedNamespace","accounts","disconnect"],"sourceRoot":"../../src","sources":["adapter.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -4,10 +4,10 @@ import { WalletConnector, solana, solanaDevnet, solanaTestnet, ConstantsUtil } f
|
|
|
4
4
|
import nacl from 'tweetnacl';
|
|
5
5
|
import bs58 from 'bs58';
|
|
6
6
|
import { PhantomProvider, SOLANA_SIGNING_METHODS } from '../providers/PhantomProvider';
|
|
7
|
-
const
|
|
8
|
-
'mainnet-beta': solana.
|
|
9
|
-
'testnet': solanaTestnet.
|
|
10
|
-
'devnet': solanaDevnet.
|
|
7
|
+
const SOLANA_CLUSTER_TO_CHAIN_ID = {
|
|
8
|
+
'mainnet-beta': solana.caipNetworkId,
|
|
9
|
+
'testnet': solanaTestnet.caipNetworkId,
|
|
10
|
+
'devnet': solanaDevnet.caipNetworkId
|
|
11
11
|
};
|
|
12
12
|
const PHANTOM_CONNECTOR_STORAGE_KEY = '@appkit/phantom-connector-data';
|
|
13
13
|
const DAPP_KEYPAIR_STORAGE_KEY = '@appkit/phantom-dapp-secret-key';
|
|
@@ -60,18 +60,20 @@ export class PhantomConnector extends WalletConnector {
|
|
|
60
60
|
if (this.isConnected()) {
|
|
61
61
|
return this.namespaces;
|
|
62
62
|
}
|
|
63
|
-
const defaultChain = opts?.defaultChain?.split(':')?.[0] === 'solana' ? opts?.defaultChain
|
|
64
|
-
const requestedCluster = this.config.cluster ?? Object.keys(
|
|
63
|
+
const defaultChain = opts?.defaultChain?.split(':')?.[0] === 'solana' ? opts?.defaultChain : opts?.namespaces?.['solana']?.chains?.[0];
|
|
64
|
+
const requestedCluster = this.config.cluster ?? Object.keys(SOLANA_CLUSTER_TO_CHAIN_ID).find(key => SOLANA_CLUSTER_TO_CHAIN_ID[key] === defaultChain);
|
|
65
65
|
try {
|
|
66
66
|
const connectResult = await this.getProvider().connect({
|
|
67
67
|
cluster: requestedCluster
|
|
68
68
|
});
|
|
69
|
-
const
|
|
70
|
-
if (!
|
|
69
|
+
const solanaChainId = SOLANA_CLUSTER_TO_CHAIN_ID[connectResult.cluster];
|
|
70
|
+
if (!solanaChainId) {
|
|
71
71
|
throw new Error(`Phantom Connect: Internal - Unknown cluster mapping for ${connectResult.cluster}`);
|
|
72
72
|
}
|
|
73
|
-
this.currentCaipNetworkId =
|
|
74
|
-
this.wallet =
|
|
73
|
+
this.currentCaipNetworkId = solanaChainId;
|
|
74
|
+
this.wallet = {
|
|
75
|
+
name: ConstantsUtil.PHANTOM_CUSTOM_WALLET.name
|
|
76
|
+
};
|
|
75
77
|
const userPublicKey = this.getProvider().getUserPublicKey();
|
|
76
78
|
if (!userPublicKey) {
|
|
77
79
|
throw new Error('Phantom Connect: Provider failed to return a user public key.');
|
|
@@ -147,11 +149,11 @@ export class PhantomConnector extends WalletConnector {
|
|
|
147
149
|
return this.getProvider().isConnected() && !!this.getProvider().getUserPublicKey();
|
|
148
150
|
}
|
|
149
151
|
async switchNetwork(network) {
|
|
150
|
-
const targetClusterName = Object.keys(
|
|
152
|
+
const targetClusterName = Object.keys(SOLANA_CLUSTER_TO_CHAIN_ID).find(key => SOLANA_CLUSTER_TO_CHAIN_ID[key] === network.caipNetworkId);
|
|
151
153
|
if (!targetClusterName) {
|
|
152
154
|
throw new Error(`Cannot switch to unsupported network ID: ${network.id}`);
|
|
153
155
|
}
|
|
154
|
-
const currentClusterName = Object.keys(
|
|
156
|
+
const currentClusterName = Object.keys(SOLANA_CLUSTER_TO_CHAIN_ID).find(key => SOLANA_CLUSTER_TO_CHAIN_ID[key] === this.currentCaipNetworkId);
|
|
155
157
|
if (targetClusterName === currentClusterName && this.isConnected()) {
|
|
156
158
|
return Promise.resolve();
|
|
157
159
|
}
|
|
@@ -161,7 +163,7 @@ export class PhantomConnector extends WalletConnector {
|
|
|
161
163
|
|
|
162
164
|
// Create a temporary options object to guide the new connection
|
|
163
165
|
const tempConnectOpts = {
|
|
164
|
-
defaultChain:
|
|
166
|
+
defaultChain: SOLANA_CLUSTER_TO_CHAIN_ID[targetClusterName]
|
|
165
167
|
};
|
|
166
168
|
|
|
167
169
|
// Attempt to connect to the new cluster
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["WalletConnector","solana","solanaDevnet","solanaTestnet","ConstantsUtil","nacl","bs58","PhantomProvider","SOLANA_SIGNING_METHODS","
|
|
1
|
+
{"version":3,"names":["WalletConnector","solana","solanaDevnet","solanaTestnet","ConstantsUtil","nacl","bs58","PhantomProvider","SOLANA_SIGNING_METHODS","SOLANA_CLUSTER_TO_CHAIN_ID","caipNetworkId","PHANTOM_CONNECTOR_STORAGE_KEY","DAPP_KEYPAIR_STORAGE_KEY","PhantomConnector","currentCaipNetworkId","SUPPORTED_NAMESPACE","constructor","config","type","cluster","init","ops","storage","initializeKeyPair","appScheme","metadata","redirect","universal","native","Error","providerConfig","dappUrl","url","dappEncryptionKeyPair","provider","restoreSession","secretKeyB58","getStorage","getItem","secretKey","decode","box","keyPair","fromSecretKey","newKeyPair","setItem","encode","error","disconnect","connect","opts","isConnected","namespaces","defaultChain","split","chains","requestedCluster","Object","keys","find","key","connectResult","getProvider","solanaChainId","wallet","name","PHANTOM_CUSTOM_WALLET","userPublicKey","getUserPublicKey","caipAddress","accounts","methods","values","events","saveSession","clearSession","undefined","clearSessionStorage","getNamespaces","getChainId","namespace","getProperties","properties","getWalletInfo","switchNetwork","network","targetClusterName","id","currentClusterName","Promise","resolve","tempConnectOpts","emit","providerSession","connectorData","removeItem"],"sourceRoot":"../../../src","sources":["connectors/PhantomConnector.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -9,9 +9,7 @@ export interface SolanaTransactionData {
|
|
|
9
9
|
}
|
|
10
10
|
export declare class SolanaAdapter extends SolanaBaseAdapter {
|
|
11
11
|
private static supportedNamespace;
|
|
12
|
-
constructor(
|
|
13
|
-
projectId: string;
|
|
14
|
-
});
|
|
12
|
+
constructor();
|
|
15
13
|
getBalance(params: GetBalanceParams): Promise<GetBalanceResponse>;
|
|
16
14
|
signTransaction<T extends Transaction | VersionedTransaction>(transaction: T, network?: AppKitNetwork): Promise<T>;
|
|
17
15
|
sendTransaction(data: SolanaTransactionData): Promise<string | null>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../src/adapter.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,KAAK,aAAa,EAClB,KAAK,WAAW,EAChB,KAAK,cAAc,EACnB,KAAK,gBAAgB,EACrB,KAAK,kBAAkB,EACxB,MAAM,mCAAmC,CAAC;AAE3C,OAAO,EAAc,WAAW,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAIhF,MAAM,WAAW,qBAAqB;IACpC,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,qBAAa,aAAc,SAAQ,iBAAiB;IAClD,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAA4B
|
|
1
|
+
{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../src/adapter.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,KAAK,aAAa,EAClB,KAAK,WAAW,EAChB,KAAK,cAAc,EACnB,KAAK,gBAAgB,EACrB,KAAK,kBAAkB,EACxB,MAAM,mCAAmC,CAAC;AAE3C,OAAO,EAAc,WAAW,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAIhF,MAAM,WAAW,qBAAqB;IACpC,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,qBAAa,aAAc,SAAQ,iBAAiB;IAClD,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAA4B;;IASvD,UAAU,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IA8CjE,eAAe,CAAC,CAAC,SAAS,WAAW,GAAG,oBAAoB,EAChE,WAAW,EAAE,CAAC,EACd,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,CAAC,CAAC;IAiEP,eAAe,CAAC,IAAI,EAAE,qBAAqB,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAsEpE,aAAa,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAe1D,WAAW,IAAI,WAAW,EAAE,GAAG,SAAS;IAOxC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAM3B,qBAAqB,IAAI,cAAc;CAGxC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PhantomConnector.d.ts","sourceRoot":"","sources":["../../../src/connectors/PhantomConnector.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,KAAK,aAAa,EAClB,KAAK,aAAa,EAClB,KAAK,cAAc,EACnB,KAAK,cAAc,EACnB,KAAK,UAAU,EACf,KAAK,UAAU,EAEf,KAAK,oBAAoB,EAKzB,KAAK,oBAAoB,EAE1B,MAAM,mCAAmC,CAAC;AAI3C,OAAO,EAAE,eAAe,EAA0B,MAAM,8BAA8B,CAAC;AACvF,OAAO,KAAK,EAEV,sBAAsB,EAGvB,MAAM,UAAU,CAAC;AAWlB,qBAAa,gBAAiB,SAAQ,eAAe;IACnD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAyB;
|
|
1
|
+
{"version":3,"file":"PhantomConnector.d.ts","sourceRoot":"","sources":["../../../src/connectors/PhantomConnector.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,KAAK,aAAa,EAClB,KAAK,aAAa,EAClB,KAAK,cAAc,EACnB,KAAK,cAAc,EACnB,KAAK,UAAU,EACf,KAAK,UAAU,EAEf,KAAK,oBAAoB,EAKzB,KAAK,oBAAoB,EAE1B,MAAM,mCAAmC,CAAC;AAI3C,OAAO,EAAE,eAAe,EAA0B,MAAM,8BAA8B,CAAC;AACvF,OAAO,KAAK,EAEV,sBAAsB,EAGvB,MAAM,UAAU,CAAC;AAWlB,qBAAa,gBAAiB,SAAQ,eAAe;IACnD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAyB;IAChD,OAAO,CAAC,oBAAoB,CAA8B;IAC1D,OAAO,CAAC,qBAAqB,CAAC,CAAkB;IAEhD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,CAA4B;gBAE3D,MAAM,CAAC,EAAE,sBAAsB;IAK5B,IAAI,CAAC,GAAG,EAAE,oBAAoB;YAuB/B,iBAAiB;IAqBhB,OAAO,CAAC,IAAI,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IAuD/D,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;YAW5B,YAAY;IAOjB,WAAW,IAAI,eAAe;IAQvC,OAAO,CAAC,UAAU;IAQT,aAAa,IAAI,UAAU;IAQ3B,UAAU,CAAC,SAAS,EAAE,cAAc,GAAG,aAAa,GAAG,SAAS;IAQhE,aAAa,IAAI,oBAAoB,GAAG,SAAS;IAIjD,aAAa,IAAI,UAAU,GAAG,SAAS;IAQhD,WAAW,IAAI,OAAO;IAKP,aAAa,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IA0CpD,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC;YAuCnC,WAAW;YAmBX,mBAAmB;CAOlC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@reown/appkit-solana-react-native",
|
|
3
|
-
"version": "0.0.0-feat-multichain-
|
|
3
|
+
"version": "0.0.0-feat-multichain-20250804182547",
|
|
4
4
|
"main": "lib/commonjs/index.js",
|
|
5
5
|
"types": "lib/typescript/index.d.ts",
|
|
6
6
|
"module": "lib/module/index.js",
|
|
@@ -39,7 +39,7 @@
|
|
|
39
39
|
"access": "public"
|
|
40
40
|
},
|
|
41
41
|
"dependencies": {
|
|
42
|
-
"@reown/appkit-common-react-native": "0.0.0-feat-multichain-
|
|
42
|
+
"@reown/appkit-common-react-native": "0.0.0-feat-multichain-20250804182547",
|
|
43
43
|
"@solana/web3.js": "1.98.2",
|
|
44
44
|
"bs58": "6.0.0",
|
|
45
45
|
"tweetnacl": "1.0.3"
|
package/src/adapter.ts
CHANGED
|
@@ -22,9 +22,8 @@ export interface SolanaTransactionData {
|
|
|
22
22
|
export class SolanaAdapter extends SolanaBaseAdapter {
|
|
23
23
|
private static supportedNamespace: ChainNamespace = 'solana';
|
|
24
24
|
|
|
25
|
-
constructor(
|
|
25
|
+
constructor() {
|
|
26
26
|
super({
|
|
27
|
-
projectId: configParams.projectId,
|
|
28
27
|
supportedNamespace: SolanaAdapter.supportedNamespace,
|
|
29
28
|
adapterType: 'solana'
|
|
30
29
|
});
|
|
@@ -26,10 +26,10 @@ import type {
|
|
|
26
26
|
PhantomProviderConfig
|
|
27
27
|
} from '../types';
|
|
28
28
|
|
|
29
|
-
const
|
|
30
|
-
'mainnet-beta': solana.
|
|
31
|
-
'testnet': solanaTestnet.
|
|
32
|
-
'devnet': solanaDevnet.
|
|
29
|
+
const SOLANA_CLUSTER_TO_CHAIN_ID: Record<PhantomCluster, CaipNetworkId> = {
|
|
30
|
+
'mainnet-beta': solana.caipNetworkId,
|
|
31
|
+
'testnet': solanaTestnet.caipNetworkId,
|
|
32
|
+
'devnet': solanaDevnet.caipNetworkId
|
|
33
33
|
};
|
|
34
34
|
|
|
35
35
|
const PHANTOM_CONNECTOR_STORAGE_KEY = '@appkit/phantom-connector-data';
|
|
@@ -37,7 +37,6 @@ const DAPP_KEYPAIR_STORAGE_KEY = '@appkit/phantom-dapp-secret-key';
|
|
|
37
37
|
|
|
38
38
|
export class PhantomConnector extends WalletConnector {
|
|
39
39
|
private readonly config: PhantomConnectorConfig;
|
|
40
|
-
|
|
41
40
|
private currentCaipNetworkId: CaipNetworkId | null = null;
|
|
42
41
|
private dappEncryptionKeyPair?: nacl.BoxKeyPair;
|
|
43
42
|
|
|
@@ -97,31 +96,31 @@ export class PhantomConnector extends WalletConnector {
|
|
|
97
96
|
return this.namespaces;
|
|
98
97
|
}
|
|
99
98
|
|
|
100
|
-
const defaultChain =
|
|
99
|
+
const defaultChain: CaipNetworkId | undefined =
|
|
101
100
|
opts?.defaultChain?.split(':')?.[0] === 'solana'
|
|
102
|
-
? opts?.defaultChain
|
|
103
|
-
: opts?.namespaces?.['solana']?.chains?.[0]
|
|
101
|
+
? opts?.defaultChain
|
|
102
|
+
: opts?.namespaces?.['solana']?.chains?.[0];
|
|
104
103
|
|
|
105
104
|
const requestedCluster =
|
|
106
105
|
this.config.cluster ??
|
|
107
|
-
(Object.keys(
|
|
108
|
-
key =>
|
|
109
|
-
SOLANA_CLUSTER_TO_CHAIN_ID_PART[key as keyof typeof SOLANA_CLUSTER_TO_CHAIN_ID_PART] ===
|
|
110
|
-
defaultChain
|
|
106
|
+
(Object.keys(SOLANA_CLUSTER_TO_CHAIN_ID).find(
|
|
107
|
+
key => SOLANA_CLUSTER_TO_CHAIN_ID[key as PhantomCluster] === defaultChain
|
|
111
108
|
) as PhantomCluster | undefined);
|
|
112
109
|
|
|
113
110
|
try {
|
|
114
111
|
const connectResult = await this.getProvider().connect({ cluster: requestedCluster });
|
|
115
112
|
|
|
116
|
-
const
|
|
117
|
-
if (!
|
|
113
|
+
const solanaChainId = SOLANA_CLUSTER_TO_CHAIN_ID[connectResult.cluster];
|
|
114
|
+
if (!solanaChainId) {
|
|
118
115
|
throw new Error(
|
|
119
116
|
`Phantom Connect: Internal - Unknown cluster mapping for ${connectResult.cluster}`
|
|
120
117
|
);
|
|
121
118
|
}
|
|
122
|
-
this.currentCaipNetworkId =
|
|
119
|
+
this.currentCaipNetworkId = solanaChainId;
|
|
123
120
|
|
|
124
|
-
this.wallet =
|
|
121
|
+
this.wallet = {
|
|
122
|
+
name: ConstantsUtil.PHANTOM_CUSTOM_WALLET.name
|
|
123
|
+
};
|
|
125
124
|
|
|
126
125
|
const userPublicKey = this.getProvider().getUserPublicKey();
|
|
127
126
|
if (!userPublicKey) {
|
|
@@ -215,21 +214,16 @@ export class PhantomConnector extends WalletConnector {
|
|
|
215
214
|
}
|
|
216
215
|
|
|
217
216
|
override async switchNetwork(network: AppKitNetwork): Promise<void> {
|
|
218
|
-
const targetClusterName = Object.keys(
|
|
219
|
-
key =>
|
|
220
|
-
SOLANA_CLUSTER_TO_CHAIN_ID_PART[key as keyof typeof SOLANA_CLUSTER_TO_CHAIN_ID_PART] ===
|
|
221
|
-
network.id
|
|
217
|
+
const targetClusterName = Object.keys(SOLANA_CLUSTER_TO_CHAIN_ID).find(
|
|
218
|
+
key => SOLANA_CLUSTER_TO_CHAIN_ID[key as PhantomCluster] === network.caipNetworkId
|
|
222
219
|
) as PhantomCluster | undefined;
|
|
223
220
|
|
|
224
221
|
if (!targetClusterName) {
|
|
225
222
|
throw new Error(`Cannot switch to unsupported network ID: ${network.id}`);
|
|
226
223
|
}
|
|
227
224
|
|
|
228
|
-
const currentClusterName = Object.keys(
|
|
229
|
-
key =>
|
|
230
|
-
`solana:${
|
|
231
|
-
SOLANA_CLUSTER_TO_CHAIN_ID_PART[key as keyof typeof SOLANA_CLUSTER_TO_CHAIN_ID_PART]
|
|
232
|
-
}` === this.currentCaipNetworkId
|
|
225
|
+
const currentClusterName = Object.keys(SOLANA_CLUSTER_TO_CHAIN_ID).find(
|
|
226
|
+
key => SOLANA_CLUSTER_TO_CHAIN_ID[key as PhantomCluster] === this.currentCaipNetworkId
|
|
233
227
|
) as PhantomCluster | undefined;
|
|
234
228
|
|
|
235
229
|
if (targetClusterName === currentClusterName && this.isConnected()) {
|
|
@@ -241,7 +235,7 @@ export class PhantomConnector extends WalletConnector {
|
|
|
241
235
|
|
|
242
236
|
// Create a temporary options object to guide the new connection
|
|
243
237
|
const tempConnectOpts: ConnectOptions = {
|
|
244
|
-
defaultChain:
|
|
238
|
+
defaultChain: SOLANA_CLUSTER_TO_CHAIN_ID[targetClusterName]
|
|
245
239
|
};
|
|
246
240
|
|
|
247
241
|
// Attempt to connect to the new cluster
|