@debridge-finance/solana-utils 1.0.2 → 2.2.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.
@@ -1,8 +1,21 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.sendAll = exports.Wallet = exports.getTransactionSize = exports.sleep = exports.bufferToHex = exports.hexToBuffer = void 0;
3
+ exports.sendAll = exports.Wallet = exports.getTransactionSize = exports.sleep = exports.bufferToHex = exports.hexToBuffer = exports.getAccountInfo = void 0;
4
4
  const buffer_1 = require("buffer");
5
5
  const web3_js_1 = require("@solana/web3.js");
6
+ async function getAccountInfo(connection, account) {
7
+ const info = await connection.getAccountInfo(account);
8
+ if (info) {
9
+ // alchemy bug fix
10
+ if (info.lamports === 0 && info.rentEpoch === 0)
11
+ return null;
12
+ return info;
13
+ }
14
+ else {
15
+ return null;
16
+ }
17
+ }
18
+ exports.getAccountInfo = getAccountInfo;
6
19
  function hexToBuffer(data, align) {
7
20
  if (!data.startsWith("0x"))
8
21
  throw new Error("[hexToBuffer]: string must start with 0x");
@@ -55,7 +68,12 @@ class Wallet {
55
68
  this.publicKey = keypair.publicKey;
56
69
  }
57
70
  async signTransaction(tx, additionalSigners) {
58
- tx.sign(this.keypair, ...(additionalSigners || []));
71
+ if (!isVersionedTx(tx)) {
72
+ tx.sign(this.keypair, ...(additionalSigners || []));
73
+ }
74
+ else {
75
+ tx.sign([this.keypair, ...(additionalSigners || [])]);
76
+ }
59
77
  return Promise.resolve(tx);
60
78
  }
61
79
  async signAllTransactions(txs, additionalSigners) {
@@ -65,26 +83,13 @@ class Wallet {
65
83
  }
66
84
  return Promise.all(promises);
67
85
  }
68
- async signVersionedTransaction(tx, additionalSigners) {
69
- tx.sign([this.keypair, ...(additionalSigners || [])]);
70
- return Promise.resolve(tx);
71
- }
72
- ;
73
- async signAllVersionedTransactions(txs, additionalSigners) {
74
- const promises = [];
75
- for (const [id, tx] of txs.entries()) {
76
- promises.push(this.signVersionedTransaction(tx, additionalSigners && additionalSigners.length > id ? additionalSigners[id] : []));
77
- }
78
- return Promise.all(promises);
79
- }
80
86
  }
81
87
  exports.Wallet = Wallet;
82
- async function sendWithRetries(connection, serialized, lastValidBlockHeight) {
88
+ async function sendWithRetries(connection, serialized, lastValidBlockHeight, timesToSend = 5) {
83
89
  const txId = await connection.sendRawTransaction(serialized, {
84
90
  skipPreflight: true,
85
91
  });
86
92
  let blockheight = await connection.getBlockHeight();
87
- const timesToSend = 5;
88
93
  let sent = 0;
89
94
  while (blockheight < lastValidBlockHeight && sent < timesToSend) {
90
95
  await connection.sendRawTransaction(serialized, {
@@ -96,35 +101,25 @@ async function sendWithRetries(connection, serialized, lastValidBlockHeight) {
96
101
  }
97
102
  return txId;
98
103
  }
99
- async function sendAll(connection, wallet, transactions, signers, waitBetweenSend, skipPreflight = false, debug = false) {
104
+ function txToV0(transaction, payer, blockhash) {
105
+ if (isVersionedTx(transaction)) {
106
+ return transaction;
107
+ }
108
+ else {
109
+ const v0Message = web3_js_1.MessageV0.compile({
110
+ instructions: transaction.instructions,
111
+ payerKey: transaction.feePayer || payer,
112
+ recentBlockhash: transaction.recentBlockhash || blockhash,
113
+ });
114
+ return new web3_js_1.VersionedTransaction(v0Message);
115
+ }
116
+ }
117
+ async function sendAll(connection, wallet, transactions, signers, waitBetweenSend, skipPreflight = false, debug = false, convertIntoTxV0 = true, rpcCalls = 5) {
118
+ if (convertIntoTxV0) {
119
+ const fakeBlockHash = "0".repeat(64);
120
+ transactions = transactions.map((tx) => txToV0(tx, wallet.publicKey, fakeBlockHash));
121
+ }
100
122
  let txIds = [];
101
- const signAllTransactions = (txs, additionalSigners) => {
102
- const result = [];
103
- const txTypes = txs.map(isVersionedTx);
104
- if (txTypes.every((isVersioned) => isVersioned === true)) {
105
- // all txs are Versioned
106
- if (wallet.signAllVersionedTransactions === undefined)
107
- throw new Error("Trying to sign versioned transactions without implementation for sigining such transactions (signAllVersionedTransactions)");
108
- return wallet.signAllVersionedTransactions(txs, additionalSigners);
109
- }
110
- else if (txTypes.every((isVersioned) => isVersioned === false)) {
111
- // all txs are Legacy
112
- return wallet.signAllTransactions(txs, additionalSigners);
113
- }
114
- // transactions are mixed
115
- if (wallet.signVersionedTransaction === undefined)
116
- throw new Error("Trying to sign versioned transaction without implementation for sigining such transaction (signVersionedTransaction)");
117
- for (const [i, tx] of txs.entries()) {
118
- const signers = additionalSigners && additionalSigners.length > i ? additionalSigners[i] : undefined;
119
- if (isVersionedTx(tx)) {
120
- result.push(wallet.signVersionedTransaction(tx, signers));
121
- }
122
- else {
123
- result.push(wallet.signTransaction(tx, signers));
124
- }
125
- }
126
- return Promise.all(result);
127
- };
128
123
  if (waitBetweenSend === undefined || waitBetweenSend === 0) {
129
124
  const { blockhash, lastValidBlockHeight } = await connection.getLatestBlockhash({ commitment: "confirmed" });
130
125
  await Promise.all(transactions.map(async (tx) => {
@@ -147,34 +142,40 @@ async function sendAll(connection, wallet, transactions, signers, waitBetweenSen
147
142
  }
148
143
  }));
149
144
  // sign after setting correct blockhashes
150
- const signed = await signAllTransactions(transactions, signers);
145
+ const signed = await wallet.signAllTransactions(transactions, signers);
151
146
  txIds = await Promise.all(signed.map((signedTx) => {
152
147
  const serialized = buffer_1.Buffer.from(signedTx.serialize());
153
148
  if (debug)
154
149
  console.debug(serialized.toString("base64"));
155
- return sendWithRetries(connection, serialized, lastValidBlockHeight);
150
+ return sendWithRetries(connection, serialized, lastValidBlockHeight, rpcCalls);
156
151
  }));
157
152
  }
158
153
  else {
159
154
  for (let i = 0; i < transactions.length; i++) {
160
155
  const tx = transactions[i];
161
- const { blockhash } = await connection.getLatestBlockhash();
162
- let signed;
156
+ const { blockhash, lastValidBlockHeight } = await connection.getLatestBlockhash();
157
+ let txV0;
163
158
  if (isVersionedTx(tx)) {
164
159
  tx.message.recentBlockhash = blockhash;
165
- if (wallet.signVersionedTransaction === undefined)
166
- throw new Error("Trying to sign versioned transaction without implementation for sigining such transaction (signVersionedTransaction)");
167
- signed = await wallet.signVersionedTransaction(tx, signers && signers.length > i ? signers[i] : undefined);
160
+ txV0 = tx;
168
161
  }
169
162
  else {
170
163
  tx.recentBlockhash = blockhash;
171
164
  tx.feePayer = wallet.publicKey;
172
- signed = await wallet.signTransaction(tx, signers && signers.length > i ? signers[i] : undefined);
165
+ const message = web3_js_1.Message.from(tx.serializeMessage());
166
+ txV0 = new web3_js_1.VersionedTransaction(new web3_js_1.MessageV0({ addressTableLookups: [], compiledInstructions: [], header: message.header, recentBlockhash: blockhash, staticAccountKeys: message.accountKeys }));
167
+ }
168
+ const signed = await wallet.signTransaction(tx, signers && signers.length > i ? signers[i] : undefined);
169
+ if (!skipPreflight) {
170
+ const simulationResult = await connection.simulateTransaction(txV0, { sigVerify: false, replaceRecentBlockhash: true, commitment: "confirmed" });
171
+ if (simulationResult.value.err !== null) {
172
+ throw new Error(`Tx simulation Error! Transaction message dump: ${buffer_1.Buffer.from(tx.serialize()).toString("base64")}\n Error: ${JSON.stringify(simulationResult.value.err)}, logs:\n ${simulationResult.value.logs?.join("\n")}`);
173
+ }
173
174
  }
174
175
  const serialized = buffer_1.Buffer.from(signed.serialize());
175
176
  if (debug)
176
177
  console.debug(serialized.toString("base64"));
177
- txIds.push(await (0, web3_js_1.sendAndConfirmRawTransaction)(connection, serialized, { maxRetries: 20, commitment: "confirmed", skipPreflight }));
178
+ txIds.push(await sendWithRetries(connection, serialized, lastValidBlockHeight, rpcCalls));
178
179
  await sleep(waitBetweenSend);
179
180
  }
180
181
  }
@@ -1 +1 @@
1
- {"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/helpers.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/helpers.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../src/interfaces.ts"],"names":[],"mappings":";;;AAAA,mCAAgC;AAahC,SAAgB,QAAQ,CAAC,GAAY;IACpC,OAAO,eAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,wDAAwD;AACtF,CAAC;AAFD,4BAEC"}
1
+ {"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../src/interfaces.ts"],"names":[],"mappings":";;;AAAA,mCAAgC;AAUhC,SAAgB,QAAQ,CAAC,GAAY;IACpC,OAAO,eAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,wDAAwD;AACtF,CAAC;AAFD,4BAEC"}
@@ -1,6 +1,20 @@
1
1
  import { __awaiter } from "tslib";
2
2
  import { Buffer } from "buffer";
3
- import { Message, MessageV0, sendAndConfirmRawTransaction, Transaction, VersionedTransaction } from "@solana/web3.js";
3
+ import { Message, MessageV0, Transaction, VersionedTransaction } from "@solana/web3.js";
4
+ export function getAccountInfo(connection, account) {
5
+ return __awaiter(this, void 0, void 0, function* () {
6
+ const info = yield connection.getAccountInfo(account);
7
+ if (info) {
8
+ // alchemy bug fix
9
+ if (info.lamports === 0 && info.rentEpoch === 0)
10
+ return null;
11
+ return info;
12
+ }
13
+ else {
14
+ return null;
15
+ }
16
+ });
17
+ }
4
18
  export function hexToBuffer(data, align) {
5
19
  if (!data.startsWith("0x"))
6
20
  throw new Error("[hexToBuffer]: string must start with 0x");
@@ -52,7 +66,12 @@ export class Wallet {
52
66
  }
53
67
  signTransaction(tx, additionalSigners) {
54
68
  return __awaiter(this, void 0, void 0, function* () {
55
- tx.sign(this.keypair, ...(additionalSigners || []));
69
+ if (!isVersionedTx(tx)) {
70
+ tx.sign(this.keypair, ...(additionalSigners || []));
71
+ }
72
+ else {
73
+ tx.sign([this.keypair, ...(additionalSigners || [])]);
74
+ }
56
75
  return Promise.resolve(tx);
57
76
  });
58
77
  }
@@ -65,30 +84,13 @@ export class Wallet {
65
84
  return Promise.all(promises);
66
85
  });
67
86
  }
68
- signVersionedTransaction(tx, additionalSigners) {
69
- return __awaiter(this, void 0, void 0, function* () {
70
- tx.sign([this.keypair, ...(additionalSigners || [])]);
71
- return Promise.resolve(tx);
72
- });
73
- }
74
- ;
75
- signAllVersionedTransactions(txs, additionalSigners) {
76
- return __awaiter(this, void 0, void 0, function* () {
77
- const promises = [];
78
- for (const [id, tx] of txs.entries()) {
79
- promises.push(this.signVersionedTransaction(tx, additionalSigners && additionalSigners.length > id ? additionalSigners[id] : []));
80
- }
81
- return Promise.all(promises);
82
- });
83
- }
84
87
  }
85
- function sendWithRetries(connection, serialized, lastValidBlockHeight) {
88
+ function sendWithRetries(connection, serialized, lastValidBlockHeight, timesToSend = 5) {
86
89
  return __awaiter(this, void 0, void 0, function* () {
87
90
  const txId = yield connection.sendRawTransaction(serialized, {
88
91
  skipPreflight: true,
89
92
  });
90
93
  let blockheight = yield connection.getBlockHeight();
91
- const timesToSend = 5;
92
94
  let sent = 0;
93
95
  while (blockheight < lastValidBlockHeight && sent < timesToSend) {
94
96
  yield connection.sendRawTransaction(serialized, {
@@ -101,40 +103,31 @@ function sendWithRetries(connection, serialized, lastValidBlockHeight) {
101
103
  return txId;
102
104
  });
103
105
  }
104
- export function sendAll(connection, wallet, transactions, signers, waitBetweenSend, skipPreflight = false, debug = false) {
106
+ function txToV0(transaction, payer, blockhash) {
107
+ if (isVersionedTx(transaction)) {
108
+ return transaction;
109
+ }
110
+ else {
111
+ const v0Message = MessageV0.compile({
112
+ instructions: transaction.instructions,
113
+ payerKey: transaction.feePayer || payer,
114
+ recentBlockhash: transaction.recentBlockhash || blockhash,
115
+ });
116
+ return new VersionedTransaction(v0Message);
117
+ }
118
+ }
119
+ export function sendAll(connection, wallet, transactions, signers, waitBetweenSend, skipPreflight = false, debug = false, convertIntoTxV0 = true, rpcCalls = 5) {
120
+ var _a;
105
121
  return __awaiter(this, void 0, void 0, function* () {
122
+ if (convertIntoTxV0) {
123
+ const fakeBlockHash = "0".repeat(64);
124
+ transactions = transactions.map((tx) => txToV0(tx, wallet.publicKey, fakeBlockHash));
125
+ }
106
126
  let txIds = [];
107
- const signAllTransactions = (txs, additionalSigners) => {
108
- const result = [];
109
- const txTypes = txs.map(isVersionedTx);
110
- if (txTypes.every((isVersioned) => isVersioned === true)) {
111
- // all txs are Versioned
112
- if (wallet.signAllVersionedTransactions === undefined)
113
- throw new Error("Trying to sign versioned transactions without implementation for sigining such transactions (signAllVersionedTransactions)");
114
- return wallet.signAllVersionedTransactions(txs, additionalSigners);
115
- }
116
- else if (txTypes.every((isVersioned) => isVersioned === false)) {
117
- // all txs are Legacy
118
- return wallet.signAllTransactions(txs, additionalSigners);
119
- }
120
- // transactions are mixed
121
- if (wallet.signVersionedTransaction === undefined)
122
- throw new Error("Trying to sign versioned transaction without implementation for sigining such transaction (signVersionedTransaction)");
123
- for (const [i, tx] of txs.entries()) {
124
- const signers = additionalSigners && additionalSigners.length > i ? additionalSigners[i] : undefined;
125
- if (isVersionedTx(tx)) {
126
- result.push(wallet.signVersionedTransaction(tx, signers));
127
- }
128
- else {
129
- result.push(wallet.signTransaction(tx, signers));
130
- }
131
- }
132
- return Promise.all(result);
133
- };
134
127
  if (waitBetweenSend === undefined || waitBetweenSend === 0) {
135
128
  const { blockhash, lastValidBlockHeight } = yield connection.getLatestBlockhash({ commitment: "confirmed" });
136
129
  yield Promise.all(transactions.map((tx) => __awaiter(this, void 0, void 0, function* () {
137
- var _a;
130
+ var _b;
138
131
  let txV0;
139
132
  if (isVersionedTx(tx)) {
140
133
  tx.message.recentBlockhash = blockhash;
@@ -149,39 +142,45 @@ export function sendAll(connection, wallet, transactions, signers, waitBetweenSe
149
142
  if (!skipPreflight) {
150
143
  const simulationResult = yield connection.simulateTransaction(txV0, { sigVerify: false, replaceRecentBlockhash: true, commitment: "confirmed" });
151
144
  if (simulationResult.value.err !== null) {
152
- throw new Error(`Tx simulation Error! Transaction message dump: ${Buffer.from(tx.serialize()).toString("base64")}\n Error: ${JSON.stringify(simulationResult.value.err)}, logs:\n ${(_a = simulationResult.value.logs) === null || _a === void 0 ? void 0 : _a.join("\n")}`);
145
+ throw new Error(`Tx simulation Error! Transaction message dump: ${Buffer.from(tx.serialize()).toString("base64")}\n Error: ${JSON.stringify(simulationResult.value.err)}, logs:\n ${(_b = simulationResult.value.logs) === null || _b === void 0 ? void 0 : _b.join("\n")}`);
153
146
  }
154
147
  }
155
148
  })));
156
149
  // sign after setting correct blockhashes
157
- const signed = yield signAllTransactions(transactions, signers);
150
+ const signed = yield wallet.signAllTransactions(transactions, signers);
158
151
  txIds = yield Promise.all(signed.map((signedTx) => {
159
152
  const serialized = Buffer.from(signedTx.serialize());
160
153
  if (debug)
161
154
  console.debug(serialized.toString("base64"));
162
- return sendWithRetries(connection, serialized, lastValidBlockHeight);
155
+ return sendWithRetries(connection, serialized, lastValidBlockHeight, rpcCalls);
163
156
  }));
164
157
  }
165
158
  else {
166
159
  for (let i = 0; i < transactions.length; i++) {
167
160
  const tx = transactions[i];
168
- const { blockhash } = yield connection.getLatestBlockhash();
169
- let signed;
161
+ const { blockhash, lastValidBlockHeight } = yield connection.getLatestBlockhash();
162
+ let txV0;
170
163
  if (isVersionedTx(tx)) {
171
164
  tx.message.recentBlockhash = blockhash;
172
- if (wallet.signVersionedTransaction === undefined)
173
- throw new Error("Trying to sign versioned transaction without implementation for sigining such transaction (signVersionedTransaction)");
174
- signed = yield wallet.signVersionedTransaction(tx, signers && signers.length > i ? signers[i] : undefined);
165
+ txV0 = tx;
175
166
  }
176
167
  else {
177
168
  tx.recentBlockhash = blockhash;
178
169
  tx.feePayer = wallet.publicKey;
179
- signed = yield wallet.signTransaction(tx, signers && signers.length > i ? signers[i] : undefined);
170
+ const message = Message.from(tx.serializeMessage());
171
+ txV0 = new VersionedTransaction(new MessageV0({ addressTableLookups: [], compiledInstructions: [], header: message.header, recentBlockhash: blockhash, staticAccountKeys: message.accountKeys }));
172
+ }
173
+ const signed = yield wallet.signTransaction(tx, signers && signers.length > i ? signers[i] : undefined);
174
+ if (!skipPreflight) {
175
+ const simulationResult = yield connection.simulateTransaction(txV0, { sigVerify: false, replaceRecentBlockhash: true, commitment: "confirmed" });
176
+ if (simulationResult.value.err !== null) {
177
+ throw new Error(`Tx simulation Error! Transaction message dump: ${Buffer.from(tx.serialize()).toString("base64")}\n Error: ${JSON.stringify(simulationResult.value.err)}, logs:\n ${(_a = simulationResult.value.logs) === null || _a === void 0 ? void 0 : _a.join("\n")}`);
178
+ }
180
179
  }
181
180
  const serialized = Buffer.from(signed.serialize());
182
181
  if (debug)
183
182
  console.debug(serialized.toString("base64"));
184
- txIds.push(yield sendAndConfirmRawTransaction(connection, serialized, { maxRetries: 20, commitment: "confirmed", skipPreflight }));
183
+ txIds.push(yield sendWithRetries(connection, serialized, lastValidBlockHeight, rpcCalls));
185
184
  yield sleep(waitBetweenSend);
186
185
  }
187
186
  }
@@ -1 +1 @@
1
- {"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/helpers.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/helpers.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../src/interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAahC,MAAM,UAAU,QAAQ,CAAC,GAAY;IACpC,OAAO,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,wDAAwD;AACtF,CAAC"}
1
+ {"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../src/interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAUhC,MAAM,UAAU,QAAQ,CAAC,GAAY;IACpC,OAAO,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,wDAAwD;AACtF,CAAC"}
@@ -2,6 +2,7 @@
2
2
  import { Buffer } from "buffer";
3
3
  import { Connection, Keypair, PublicKey, Signer, Transaction, VersionedTransaction } from "@solana/web3.js";
4
4
  import { interfaces } from ".";
5
+ export declare function getAccountInfo(connection: Connection, account: PublicKey): Promise<import("@solana/web3.js").AccountInfo<Buffer> | null>;
5
6
  export declare function hexToBuffer(data: string, align?: number): Buffer;
6
7
  export declare function bufferToHex(data: Buffer | number[] | Uint8Array): string;
7
8
  export declare function sleep(milliSeconds: number): Promise<void>;
@@ -17,11 +18,9 @@ export declare class Wallet implements interfaces.IWallet {
17
18
  private keypair;
18
19
  publicKey: PublicKey;
19
20
  constructor(keypair: Keypair);
20
- signTransaction(tx: Transaction, additionalSigners?: Signer[]): Promise<Transaction>;
21
- signAllTransactions(txs: Transaction[], additionalSigners?: (Signer[] | undefined)[]): Promise<Transaction[]>;
22
- signVersionedTransaction(tx: VersionedTransaction, additionalSigners?: Signer[] | undefined): Promise<VersionedTransaction>;
23
- signAllVersionedTransactions(txs: VersionedTransaction[], additionalSigners?: (Signer[] | undefined)[] | undefined): Promise<VersionedTransaction[]>;
21
+ signTransaction<T extends Transaction | VersionedTransaction>(tx: T, additionalSigners?: Signer[]): Promise<T>;
22
+ signAllTransactions<T extends Transaction | VersionedTransaction>(txs: T[], additionalSigners?: (Signer[] | undefined)[]): Promise<Awaited<T>[]>;
24
23
  }
25
- export declare function sendAll(connection: Connection, wallet: interfaces.IWallet, transactions: AnyTransaction[], signers?: Keypair[][], waitBetweenSend?: number, skipPreflight?: boolean, debug?: boolean): Promise<string[]>;
24
+ export declare function sendAll(connection: Connection, wallet: interfaces.IWallet, transactions: AnyTransaction[], signers?: Keypair[][], waitBetweenSend?: number, skipPreflight?: boolean, debug?: boolean, convertIntoTxV0?: boolean, rpcCalls?: number): Promise<string[]>;
26
25
  export {};
27
26
  //# sourceMappingURL=helpers.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/helpers.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,UAAU,EAAE,OAAO,EAAsB,SAAS,EAAgC,MAAM,EAAE,WAAW,EAAoB,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAChL,OAAO,EAAE,UAAU,EAAE,MAAM,GAAG,CAAC;AAE/B,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAahE;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,UAAU,UAE/D;AAED,wBAAsB,KAAK,CAAC,YAAY,EAAE,MAAM,iBAI/C;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,WAAW,EAAE,QAAQ,CAAC,EAAE,SAAS,GAAG,MAAM,CAazF;AAMD,aAAK,cAAc,GAAG,WAAW,GAAG,oBAAoB,CAAC;AAEzD,qBAAa,MAAO,YAAW,UAAU,CAAC,OAAO;IAGpC,OAAO,CAAC,OAAO;IAF3B,SAAS,EAAE,SAAS,CAAC;gBAED,OAAO,EAAE,OAAO;IAI9B,eAAe,CAAC,EAAE,EAAE,WAAW,EAAE,iBAAiB,CAAC,EAAE,MAAM,EAAE;IAM7D,mBAAmB,CAAC,GAAG,EAAE,WAAW,EAAE,EAAE,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,EAAE;IASpF,wBAAwB,CAAC,EAAE,EAAE,oBAAoB,EAAE,iBAAiB,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAM3H,4BAA4B,CAAC,GAAG,EAAE,oBAAoB,EAAE,EAAE,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,EAAE,GAAG,SAAS,GAAG,OAAO,CAAC,oBAAoB,EAAE,CAAC;CAQ1J;AAuBD,wBAAsB,OAAO,CAC5B,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,UAAU,CAAC,OAAO,EAC1B,YAAY,EAAE,cAAc,EAAE,EAC9B,OAAO,CAAC,EAAE,OAAO,EAAE,EAAE,EACrB,eAAe,CAAC,EAAE,MAAM,EACxB,aAAa,GAAE,OAAe,EAC9B,KAAK,GAAE,OAAe,qBAoFtB"}
1
+ {"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/helpers.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,UAAU,EAAE,OAAO,EAAsB,SAAS,EAAgC,MAAM,EAAE,WAAW,EAAoB,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAChL,OAAO,EAAE,UAAU,EAAE,MAAM,GAAG,CAAC;AAE/B,wBAAsB,cAAc,CAAC,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,SAAS,iEAU9E;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAahE;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,UAAU,UAE/D;AAED,wBAAsB,KAAK,CAAC,YAAY,EAAE,MAAM,iBAI/C;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,WAAW,EAAE,QAAQ,CAAC,EAAE,SAAS,GAAG,MAAM,CAazF;AAMD,aAAK,cAAc,GAAG,WAAW,GAAG,oBAAoB,CAAC;AAEzD,qBAAa,MAAO,YAAW,UAAU,CAAC,OAAO;IAGpC,OAAO,CAAC,OAAO;IAF3B,SAAS,EAAE,SAAS,CAAC;gBAED,OAAO,EAAE,OAAO;IAI9B,eAAe,CAAC,CAAC,SAAS,WAAW,GAAG,oBAAoB,EAAE,EAAE,EAAE,CAAC,EAAE,iBAAiB,CAAC,EAAE,MAAM,EAAE;IAUjG,mBAAmB,CAAC,CAAC,SAAS,WAAW,GAAG,oBAAoB,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,EAAE;CAQ9H;AAqCD,wBAAsB,OAAO,CAC5B,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,UAAU,CAAC,OAAO,EAC1B,YAAY,EAAE,cAAc,EAAE,EAC9B,OAAO,CAAC,EAAE,OAAO,EAAE,EAAE,EACrB,eAAe,CAAC,EAAE,MAAM,EACxB,aAAa,GAAE,OAAe,EAC9B,KAAK,GAAE,OAAe,EACtB,eAAe,GAAE,OAAc,EAC/B,QAAQ,GAAE,MAAU,qBAsEpB"}
@@ -4,10 +4,8 @@ import { PublicKey, Signer, Transaction, VersionedTransaction } from "@solana/we
4
4
  import BN from "bn.js";
5
5
  export interface IWallet {
6
6
  publicKey: PublicKey;
7
- signTransaction: (tx: Transaction, additionalSigners?: Signer[]) => Promise<Transaction>;
8
- signAllTransactions: (txs: Transaction[], additionalSigners?: (Signer[] | undefined)[]) => Promise<Transaction[]>;
9
- signVersionedTransaction?: (tx: VersionedTransaction, additionalSigners?: Signer[]) => Promise<VersionedTransaction>;
10
- signAllVersionedTransactions?: (txs: VersionedTransaction[], additionalSigners?: (Signer[] | undefined)[]) => Promise<VersionedTransaction[]>;
7
+ signTransaction: <T extends Transaction | VersionedTransaction>(tx: T, additionalSigners?: Signer[]) => Promise<T>;
8
+ signAllTransactions: <T extends Transaction | VersionedTransaction>(txs: T[], additionalSigners?: (Signer[] | undefined)[]) => Promise<T[]>;
11
9
  }
12
10
  export declare function isBuffer(arg: unknown): arg is Buffer;
13
11
  export interface HashDeployInfoParams {
@@ -1 +1 @@
1
- {"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../src/interfaces.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACvF,OAAO,EAAE,MAAM,OAAO,CAAC;AAEvB,MAAM,WAAW,OAAO;IACvB,SAAS,EAAE,SAAS,CAAC;IACrB,eAAe,EAAE,CAAC,EAAE,EAAE,WAAW,EAAE,iBAAiB,CAAC,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,WAAW,CAAC,CAAC;IACzF,mBAAmB,EAAE,CAAC,GAAG,EAAE,WAAW,EAAE,EAAE,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,EAAE,KAAK,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;IAElH,wBAAwB,CAAC,EAAE,CAAC,EAAE,EAAE,oBAAoB,EAAE,iBAAiB,CAAC,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,oBAAoB,CAAC,CAAC;IACrH,4BAA4B,CAAC,EAAE,CAAC,GAAG,EAAE,oBAAoB,EAAE,EAAE,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,EAAE,KAAK,OAAO,CAAC,oBAAoB,EAAE,CAAC,CAAC;CAC9I;AAED,wBAAgB,QAAQ,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,MAAM,CAEpD;AAED,MAAM,WAAW,oBAAoB;IACpC;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;CACjB;AACD,MAAM,WAAW,cAAc;IAC9B,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;IACjC;;OAEG;IACH,eAAe,EAAE,MAAM,CAAC;IACxB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B;;OAEG;IACH,YAAY,EAAE,MAAM,CAAC;CACrB;AAED,oBAAY,SAAS,GAAG,MAAM,CAAC;AAC/B,oBAAY,YAAY,GAAG,MAAM,GAAG,SAAS,CAAC;AAC9C,oBAAY,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,EAAE,GAAG,MAAM,CAAC"}
1
+ {"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../src/interfaces.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACvF,OAAO,EAAE,MAAM,OAAO,CAAC;AAEvB,MAAM,WAAW,OAAO;IACvB,SAAS,EAAE,SAAS,CAAC;IACrB,eAAe,EAAE,CAAC,CAAC,SAAS,WAAW,GAAG,oBAAoB,EAAE,EAAE,EAAE,CAAC,EAAE,iBAAiB,CAAC,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;IACnH,mBAAmB,EAAE,CAAC,CAAC,SAAS,WAAW,GAAG,oBAAoB,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,EAAE,KAAK,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC;CAC5I;AAED,wBAAgB,QAAQ,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,MAAM,CAEpD;AAED,MAAM,WAAW,oBAAoB;IACpC;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;CACjB;AACD,MAAM,WAAW,cAAc;IAC9B,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;IACjC;;OAEG;IACH,eAAe,EAAE,MAAM,CAAC;IACxB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B;;OAEG;IACH,YAAY,EAAE,MAAM,CAAC;CACrB;AAED,oBAAY,SAAS,GAAG,MAAM,CAAC;AAC/B,oBAAY,YAAY,GAAG,MAAM,GAAG,SAAS,CAAC;AAC9C,oBAAY,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,EAAE,GAAG,MAAM,CAAC"}
package/package.json CHANGED
@@ -1,11 +1,10 @@
1
1
  {
2
2
  "name": "@debridge-finance/solana-utils",
3
3
  "description": "Common utils package to power communication with Solana contracts at deBridge",
4
- "version": "1.0.2",
4
+ "version": "2.2.0",
5
5
  "author": "deBridge",
6
6
  "license": "GPL-3.0-only",
7
7
  "homepage": "https://debridge.finance",
8
-
9
8
  "repository": {
10
9
  "type": "git",
11
10
  "url": "github:debridge-finance/solana-utils"
@@ -15,7 +14,6 @@
15
14
  "deBridge",
16
15
  "blockchain"
17
16
  ],
18
-
19
17
  "main": "./dist/cjs/index.js",
20
18
  "module": "dist/esm/index.js",
21
19
  "types": "./dist/types/index",
@@ -42,7 +40,7 @@
42
40
  "build": "rimraf dist && npm run build:esm && npm run build:node && npm run build:browser"
43
41
  },
44
42
  "dependencies": {
45
- "@solana/web3.js": "1.62.0",
43
+ "@solana/web3.js": "1.73.0",
46
44
  "bn.js": "5.2.1",
47
45
  "buffer": "6.0.3",
48
46
  "ethers": "5.7.1"