@primuslabs/fund-js-sdk 0.1.21 → 0.1.23
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/dist/index.js +8 -14
- package/dist/index.mjs +8 -14
- package/package.json +2 -2
package/dist/index.js
CHANGED
|
@@ -5958,6 +5958,8 @@ async function reClaim({
|
|
|
5958
5958
|
tx = new import_web33.Transaction().add(instruction);
|
|
5959
5959
|
tx.feePayer = userKey;
|
|
5960
5960
|
tx.recentBlockhash = (await provider.connection.getLatestBlockhash()).blockhash;
|
|
5961
|
+
signatureStr = await provider.sendAndConfirm(tx);
|
|
5962
|
+
return resolve(signatureStr);
|
|
5961
5963
|
console.log("UnSigned tx size:", tx.serialize({ requireAllSignatures: false, verifySignatures: false }).length, "bytes");
|
|
5962
5964
|
const signedTx = await provider.wallet.signTransaction(tx);
|
|
5963
5965
|
signedTx.partialSign();
|
|
@@ -6041,19 +6043,8 @@ async function reSenderWithdraw({
|
|
|
6041
6043
|
}).transaction();
|
|
6042
6044
|
tx.feePayer = userKey;
|
|
6043
6045
|
tx.recentBlockhash = (await provider.connection.getLatestBlockhash()).blockhash;
|
|
6044
|
-
|
|
6045
|
-
|
|
6046
|
-
signatureStr = getTxSigStrFromTx(signedTx);
|
|
6047
|
-
const isOnChain = await getTxIsOnChain(signatureStr, provider.connection);
|
|
6048
|
-
if (isOnChain) {
|
|
6049
|
-
console.log("reSenderWithdraw done", signatureStr);
|
|
6050
|
-
return resolve(signatureStr);
|
|
6051
|
-
} else {
|
|
6052
|
-
const serializeSignedTx = signedTx.serialize();
|
|
6053
|
-
signatureStr = await provider.connection.sendRawTransaction(serializeSignedTx);
|
|
6054
|
-
console.log("reSenderWithdraw done", signatureStr);
|
|
6055
|
-
return resolve(signatureStr);
|
|
6056
|
-
}
|
|
6046
|
+
signatureStr = await provider.sendAndConfirm(tx);
|
|
6047
|
+
return resolve(signatureStr);
|
|
6057
6048
|
} catch (err) {
|
|
6058
6049
|
if (getTxIsOnProcess(err)) {
|
|
6059
6050
|
console.log("reSenderWithdraw done");
|
|
@@ -6215,10 +6206,13 @@ var ZktlsSdk = class {
|
|
|
6215
6206
|
platformDevice = "ios";
|
|
6216
6207
|
}
|
|
6217
6208
|
console.log("init appId", appId, platformDevice);
|
|
6209
|
+
const uaHasPhantom = /Phantom/i.test(navigator.userAgent);
|
|
6210
|
+
const openAndroidApp = platformDevice === "android" && uaHasPhantom;
|
|
6211
|
+
console.log("openAndroidApp", openAndroidApp);
|
|
6218
6212
|
const extensionVersion = await this.zkTlsSdk.init(
|
|
6219
6213
|
appId,
|
|
6220
6214
|
"",
|
|
6221
|
-
{ platform: platformDevice }
|
|
6215
|
+
{ platform: platformDevice, openAndroidApp }
|
|
6222
6216
|
);
|
|
6223
6217
|
resolve(extensionVersion);
|
|
6224
6218
|
} catch (error) {
|
package/dist/index.mjs
CHANGED
|
@@ -5931,6 +5931,8 @@ async function reClaim({
|
|
|
5931
5931
|
tx = new Transaction().add(instruction);
|
|
5932
5932
|
tx.feePayer = userKey;
|
|
5933
5933
|
tx.recentBlockhash = (await provider.connection.getLatestBlockhash()).blockhash;
|
|
5934
|
+
signatureStr = await provider.sendAndConfirm(tx);
|
|
5935
|
+
return resolve(signatureStr);
|
|
5934
5936
|
console.log("UnSigned tx size:", tx.serialize({ requireAllSignatures: false, verifySignatures: false }).length, "bytes");
|
|
5935
5937
|
const signedTx = await provider.wallet.signTransaction(tx);
|
|
5936
5938
|
signedTx.partialSign();
|
|
@@ -6014,19 +6016,8 @@ async function reSenderWithdraw({
|
|
|
6014
6016
|
}).transaction();
|
|
6015
6017
|
tx.feePayer = userKey;
|
|
6016
6018
|
tx.recentBlockhash = (await provider.connection.getLatestBlockhash()).blockhash;
|
|
6017
|
-
|
|
6018
|
-
|
|
6019
|
-
signatureStr = getTxSigStrFromTx(signedTx);
|
|
6020
|
-
const isOnChain = await getTxIsOnChain(signatureStr, provider.connection);
|
|
6021
|
-
if (isOnChain) {
|
|
6022
|
-
console.log("reSenderWithdraw done", signatureStr);
|
|
6023
|
-
return resolve(signatureStr);
|
|
6024
|
-
} else {
|
|
6025
|
-
const serializeSignedTx = signedTx.serialize();
|
|
6026
|
-
signatureStr = await provider.connection.sendRawTransaction(serializeSignedTx);
|
|
6027
|
-
console.log("reSenderWithdraw done", signatureStr);
|
|
6028
|
-
return resolve(signatureStr);
|
|
6029
|
-
}
|
|
6019
|
+
signatureStr = await provider.sendAndConfirm(tx);
|
|
6020
|
+
return resolve(signatureStr);
|
|
6030
6021
|
} catch (err) {
|
|
6031
6022
|
if (getTxIsOnProcess(err)) {
|
|
6032
6023
|
console.log("reSenderWithdraw done");
|
|
@@ -6188,10 +6179,13 @@ var ZktlsSdk = class {
|
|
|
6188
6179
|
platformDevice = "ios";
|
|
6189
6180
|
}
|
|
6190
6181
|
console.log("init appId", appId, platformDevice);
|
|
6182
|
+
const uaHasPhantom = /Phantom/i.test(navigator.userAgent);
|
|
6183
|
+
const openAndroidApp = platformDevice === "android" && uaHasPhantom;
|
|
6184
|
+
console.log("openAndroidApp", openAndroidApp);
|
|
6191
6185
|
const extensionVersion = await this.zkTlsSdk.init(
|
|
6192
6186
|
appId,
|
|
6193
6187
|
"",
|
|
6194
|
-
{ platform: platformDevice }
|
|
6188
|
+
{ platform: platformDevice, openAndroidApp }
|
|
6195
6189
|
);
|
|
6196
6190
|
resolve(extensionVersion);
|
|
6197
6191
|
} catch (error) {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@primuslabs/fund-js-sdk",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.23",
|
|
4
4
|
"author": "Primus Labs <dev@primuslabs.org>",
|
|
5
5
|
"description": "Primus fund js sdk",
|
|
6
6
|
"repository": {
|
|
@@ -56,7 +56,7 @@
|
|
|
56
56
|
},
|
|
57
57
|
"dependencies": {
|
|
58
58
|
"@coral-xyz/anchor": "^0.31.1",
|
|
59
|
-
"@primuslabs/zktls-js-sdk": "^0.3.
|
|
59
|
+
"@primuslabs/zktls-js-sdk": "^0.3.5",
|
|
60
60
|
"@solana/spl-token": "^0.4.13",
|
|
61
61
|
"@solana/web3.js": "^1.98.4",
|
|
62
62
|
"axios": "^1.8.1",
|