@relayprotocol/relay-svm-wallet-adapter 17.0.1 → 18.0.0
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/_cjs/src/adapter.js +12 -1
- package/_cjs/src/adapter.js.map +1 -1
- package/_cjs/tsconfig.build.tsbuildinfo +1 -1
- package/_esm/src/adapter.js +12 -1
- package/_esm/src/adapter.js.map +1 -1
- package/_esm/tsconfig.build.tsbuildinfo +1 -1
- package/_types/src/adapter.d.ts.map +1 -1
- package/_types/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +2 -2
package/_cjs/src/adapter.js
CHANGED
|
@@ -3,6 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.adaptSolanaWallet = void 0;
|
|
4
4
|
const web3_js_1 = require("@solana/web3.js");
|
|
5
5
|
const relay_sdk_1 = require("@relayprotocol/relay-sdk");
|
|
6
|
+
const BASE58_SIGNATURE_REGEX = /^[1-9A-HJ-NP-Za-km-z]+$/;
|
|
7
|
+
const assertBase58TransactionSignature = (signature) => {
|
|
8
|
+
if (typeof signature !== 'string' ||
|
|
9
|
+
signature.length === 0 ||
|
|
10
|
+
!BASE58_SIGNATURE_REGEX.test(signature)) {
|
|
11
|
+
throw new Error('Invalid Solana signature: expected base58.');
|
|
12
|
+
}
|
|
13
|
+
};
|
|
6
14
|
const adaptSolanaWallet = (walletAddress, chainId, connection, signAndSendTransaction, payerKey) => {
|
|
7
15
|
let _chainId = chainId;
|
|
8
16
|
const getChainId = async () => {
|
|
@@ -39,10 +47,13 @@ const adaptSolanaWallet = (walletAddress, chainId, connection, signAndSendTransa
|
|
|
39
47
|
.then((res) => res.value)) ?? []));
|
|
40
48
|
const transaction = new web3_js_1.VersionedTransaction(messageV0);
|
|
41
49
|
const signature = await signAndSendTransaction(transaction, undefined, instructions, stepItem.data.instructions);
|
|
50
|
+
const transactionSignature = signature?.signature;
|
|
51
|
+
assertBase58TransactionSignature(transactionSignature);
|
|
42
52
|
client.log(['Transaction Signature obtained', signature], relay_sdk_1.LogLevel.Verbose);
|
|
43
|
-
return
|
|
53
|
+
return transactionSignature;
|
|
44
54
|
},
|
|
45
55
|
handleConfirmTransactionStep: async (txHash) => {
|
|
56
|
+
assertBase58TransactionSignature(txHash);
|
|
46
57
|
const { blockhash, lastValidBlockHeight } = await connection.getLatestBlockhash('confirmed');
|
|
47
58
|
const result = await connection.confirmTransaction({
|
|
48
59
|
blockhash: blockhash,
|
package/_cjs/src/adapter.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../src/adapter.ts"],"names":[],"mappings":";;;AAAA,6CASwB;AACxB,wDAKiC;
|
|
1
|
+
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../src/adapter.ts"],"names":[],"mappings":"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"}
|