Skip to content

Set rpc cluster name as global window variable for walletAdapterLib #202

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GabrielePicco merged 2 commits into from
Feb 6, 2024
Merged

Set rpc cluster name as global window variable for walletAdapterLib #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f335e2e
Set rpc cluster name as global window variable for walletAdapterLib
nicoeft Jan 24, 2024
53b4137
refreshWalletAdapters fixes cluster changes for SolanaMobileWallet ad…
nicoeft Feb 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
290 changes: 162 additions & 128 deletions Runtime/Plugins/SolanaWalletAdapterWebGL/SolanaWalletAdapterWebGL.jslib
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,130 +1,164 @@
mergeInto(LibraryManager.library, {
InitWalletAdapter: async function (callback) {
const isXnft = Boolean("xnft" in window && window.xnft != undefined && window.xnft.solana != undefined && window.xnft.solana.publicKey != undefined);
// Add UnityWalletAdapter from CDN
if(window.walletAdapterLib == undefined){
console.log("Adding WalletAdapterLib")
var script = document.createElement("script");
script.src = "https://cdn.jsdelivr.net/gh/magicblock-labs/unity-js-wallet-adapter@main/dist/wallet-adapter-lib.js";
document.head.appendChild(script);
script.onload = function() {
console.log("WalletAdapterLib loaded");
Module.dynCall_vi(callback, isXnft);
};
}else{
Module.dynCall_vi(callback, isXnft);
InitWalletAdapter: async function (callback, rpcClusterPtr) {
const isXnft = Boolean(
"xnft" in window &&
window.xnft != undefined &&
window.xnft.solana != undefined &&
window.xnft.solana.publicKey != undefined
);
window.rpcCluster = UTF8ToString(rpcClusterPtr);
// Add UnityWalletAdapter from CDN
if (window.walletAdapterLib == undefined) {
var script = document.createElement("script");
script.src =
"https://cdn.jsdelivr.net/gh/magicblock-labs/[email protected]/dist/wallet-adapter-lib.js";
document.head.appendChild(script);
script.onload = function () {
Module.dynCall_vi(callback, isXnft);
};
} else {
window.walletAdapterLib.refreshWalletAdapters();
Module.dynCall_vi(callback, isXnft);
}
},
ExternGetWallets: async function (callback) {
try {
const wallets = await window.walletAdapterLib.getWallets();
var bufferSize = lengthBytesUTF8(wallets) + 1;
var walletsPtr = _malloc(bufferSize);
stringToUTF8(wallets, walletsPtr, bufferSize);
Module.dynCall_vi(callback, walletsPtr);
} catch (err) {
console.error(err.message);
Module.dynCall_vi(callback, null);
}
},
ExternConnectWallet: async function (walletNamePtr, callback) {
try {
const walletName = UTF8ToString(walletNamePtr);
var pubKey;
if (walletName === "XNFT") {
pubKey = window.xnft.solana.publicKey.toString();
} else {
pubKey = await window.walletAdapterLib.connectWallet(walletName);
}
if (pubKey == undefined) {
throw new Error("Unable to connect to: " + walletName);
}
var bufferSize = lengthBytesUTF8(pubKey) + 1;
var pubKeyPtr = _malloc(bufferSize);
stringToUTF8(pubKey, pubKeyPtr, bufferSize);
Module.dynCall_vi(callback, pubKeyPtr);
} catch (err) {
console.error(err.message);
Module.dynCall_vi(callback, null);
}
},
ExternSignTransactionWallet: async function (
walletNamePtr,
transactionPtr,
callback
) {
try {
const walletName = UTF8ToString(walletNamePtr);
var base64transaction = UTF8ToString(transactionPtr);
let signedTransaction;
if (walletName === "XNFT") {
const transaction =
window.walletAdapterLib.getTransactionFromStr(base64transaction);
signedTransaction = await window.xnft.solana.signTransaction(
transaction
);
} else {
signedTransaction = await window.walletAdapterLib.signTransaction(
walletName,
base64transaction
);
}
let txStr = Buffer.from(signedTransaction.serialize()).toString("base64");
var bufferSize = lengthBytesUTF8(txStr) + 1;
var txPtr = _malloc(bufferSize);
stringToUTF8(txStr, txPtr, bufferSize);
Module.dynCall_vi(callback, txPtr);
} catch (err) {
console.error(err.message);
Module.dynCall_vi(callback, null);
}
},
ExternSignMessageWallet: async function (
walletNamePtr,
messagePtr,
callback
) {
try {
const walletName = UTF8ToString(walletNamePtr);
var base64Message = UTF8ToString(messagePtr);
let signatureStr;
if (walletName === "XNFT") {
const messageBytes = Uint8Array.from(atob(base64Message), (c) =>
c.charCodeAt(0)
);
const signedMessage = await window.xnft.solana.signMessage(
messageBytes
);
signatureStr = btoa(String.fromCharCode(...signedMessage));
} else {
var signature = await window.walletAdapterLib.signMessage(
walletName,
atob(base64Message)
);
signatureStr = signature.toString("base64");
}
var bufferSize = lengthBytesUTF8(signatureStr) + 1;
var signaturePtr = _malloc(bufferSize);
stringToUTF8(signatureStr, signaturePtr, bufferSize);
Module.dynCall_vi(callback, signaturePtr);
} catch (err) {
console.error(err.message);
Module.dynCall_vi(callback, null);
}
},
ExternSignAllTransactionsWallet: async function (
walletNamePtr,
transactionsPtr,
callback
) {
try {
const walletName = UTF8ToString(walletNamePtr);
var base64transactionsStr = UTF8ToString(transactionsPtr);
var base64transactions = base64transactionsStr.split(",");
let signedTransactions;
if (walletName === "XNFT") {
let transactions = [];
for (var i = 0; i < base64transactions.length; i++) {
const transaction = window.walletAdapterLib.getTransactionFromStr(
base64transactions[i]
);
transactions.push(transaction);
}
},
ExternGetWallets: async function(callback) {
try {
const wallets = await window.walletAdapterLib.getWallets();
var bufferSize = lengthBytesUTF8(wallets) + 1;
var walletsPtr = _malloc(bufferSize);
stringToUTF8(wallets, walletsPtr, bufferSize);
Module.dynCall_vi(callback, walletsPtr);
} catch (err) {
console.error(err.message);
Module.dynCall_vi(callback, null);
}
},
ExternConnectWallet: async function (walletNamePtr, callback) {
try {
const walletName = UTF8ToString(walletNamePtr)
var pubKey;
if(walletName === 'XNFT'){
pubKey = window.xnft.solana.publicKey.toString();
} else {
pubKey = await window.walletAdapterLib.connectWallet(walletName);
}
if(pubKey == undefined){
throw new Error('Unable to connect to: ' + walletName);
}
var bufferSize = lengthBytesUTF8(pubKey) + 1;
var pubKeyPtr = _malloc(bufferSize);
stringToUTF8(pubKey, pubKeyPtr, bufferSize);
Module.dynCall_vi(callback, pubKeyPtr);
} catch (err) {
console.error(err.message);
Module.dynCall_vi(callback, null);
}
},
ExternSignTransactionWallet: async function (walletNamePtr, transactionPtr, callback) {
try {
const walletName = UTF8ToString(walletNamePtr)
var base64transaction = UTF8ToString(transactionPtr)
let signedTransaction;
if(walletName === 'XNFT'){
const transaction = window.walletAdapterLib.getTransactionFromStr(base64transaction);
signedTransaction = await window.xnft.solana.signTransaction(transaction);
} else {
signedTransaction = await window.walletAdapterLib.signTransaction(walletName, base64transaction);
}
let txStr = Buffer.from(signedTransaction.serialize()).toString('base64');
var bufferSize = lengthBytesUTF8(txStr) + 1;
var txPtr = _malloc(bufferSize);
stringToUTF8(txStr, txPtr, bufferSize);
Module.dynCall_vi(callback, txPtr);
} catch (err) {
console.error(err.message);
Module.dynCall_vi(callback, null);
}
},
ExternSignMessageWallet: async function (walletNamePtr, messagePtr, callback) {
try {
const walletName = UTF8ToString(walletNamePtr)
var base64Message = UTF8ToString(messagePtr)
let signatureStr;
if(walletName === 'XNFT'){
const messageBytes = Uint8Array.from(atob(base64Message), (c) => c.charCodeAt(0));
const signedMessage = await window.xnft.solana.signMessage(messageBytes);
signatureStr = btoa(String.fromCharCode(...signedMessage));
} else {
var signature = await window.walletAdapterLib.signMessage(walletName, atob(base64Message));
signatureStr = signature.toString('base64');
}
var bufferSize = lengthBytesUTF8(signatureStr) + 1;
var signaturePtr = _malloc(bufferSize);
stringToUTF8(signatureStr, signaturePtr, bufferSize);
Module.dynCall_vi(callback, signaturePtr);
} catch (err) {
console.error(err.message);
Module.dynCall_vi(callback, null);
}
},
ExternSignAllTransactionsWallet: async function (walletNamePtr, transactionsPtr, callback) {
try {
const walletName = UTF8ToString(walletNamePtr)
var base64transactionsStr = UTF8ToString(transactionsPtr)
var base64transactions = base64transactionsStr.split(',');
let signedTransactions;
if(walletName === 'XNFT'){
let transactions = [];
for(var i = 0; i < base64transactions.length; i++){
const transaction = window.walletAdapterLib.getTransactionFromStr(base64transactions[i]);
transactions.push(transaction);
}
signedTransactions = await window.xnft.solana.signAllTransactions(transactions);
} else {
signedTransactions = await window.walletAdapterLib.signAllTransactions(walletName, base64transactions);
}
var serializedSignedTransactions = [];
for (var i = 0; i < signedTransactions.length; i++) {
var signedTransaction = signedTransactions[i];
var txStr = signedTransaction.serialize().toString('base64');
serializedSignedTransactions.push(txStr);
}
var txsStr = serializedSignedTransactions.join(',');
var bufferSize = lengthBytesUTF8(txsStr) + 1;
var txsPtr = _malloc(bufferSize);
stringToUTF8(txsStr, txsPtr, bufferSize);
Module.dynCall_vi(callback, txsPtr);
} catch (err) {
console.error(err.message);
Module.dynCall_vi(callback, null);
}
},
} );




signedTransactions = await window.xnft.solana.signAllTransactions(
transactions
);
} else {
signedTransactions = await window.walletAdapterLib.signAllTransactions(
walletName,
base64transactions
);
}
var serializedSignedTransactions = [];
for (var i = 0; i < signedTransactions.length; i++) {
var signedTransaction = signedTransactions[i];
var txStr = signedTransaction.serialize().toString("base64");
serializedSignedTransactions.push(txStr);
}
var txsStr = serializedSignedTransactions.join(",");
var bufferSize = lengthBytesUTF8(txsStr) + 1;
var txsPtr = _malloc(bufferSize);
stringToUTF8(txsStr, txsPtr, bufferSize);
Module.dynCall_vi(callback, txsPtr);
} catch (err) {
console.error(err.message);
Module.dynCall_vi(callback, null);
}
},
});
10 changes: 7 additions & 3 deletions Runtime/codebase/SolanaWalletAdapterWebGL/SolanaWalletAdapterWebGL.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ public class WalletSpecsObject
public static WalletSpecs[] Wallets { get; private set; }

private static WalletSpecs _currentWallet;

private static string _clusterName;


[Obsolete("Use SolanaWalletAdapter class instead, which is the cross platform wrapper.")]
Expand All @@ -68,12 +70,14 @@ public SolanaWalletAdapterWebGL(
{
throw new Exception("SolanaWalletAdapterWebGL can only be used on WebGL");
}
_clusterName = RPCNameMap[(int)RpcCluster];
}

private static async Task InitWallets() {
_currentWallet = null;
_walletsInitializedTaskCompletionSource = new TaskCompletionSource<bool>();
InitWalletAdapter(OnWalletsInitialized);

InitWalletAdapter(OnWalletsInitialized, _clusterName);
bool isXnft = await _walletsInitializedTaskCompletionSource.Task;
if (isXnft){
_currentWallet = new WalletSpecs()
Expand Down Expand Up @@ -300,7 +304,7 @@ private static void OnWalletsLoaded(string walletsData)
private static extern string ExternGetWallets(Action<string> callback);

[DllImport("__Internal")]
private static extern void InitWalletAdapter(Action<bool> callback);
private static extern void InitWalletAdapter(Action<bool> callback, string clusterName);


#else
Expand All @@ -309,7 +313,7 @@ private static void ExternSignTransactionWallet(string walletName, string transa
private static void ExternSignAllTransactionsWallet(string walletName, string transactions, Action<string> callback){}
private static void ExternSignMessageWallet(string walletName, string messageBase64, Action<string> callback){}
private static string ExternGetWallets(Action<string> callback){return null;}
private static void InitWalletAdapter(Action<bool> callback){}
private static void InitWalletAdapter(Action<bool> callback, string clusterName){}

#endif
}
Expand Down