@debridge-finance/solana-utils 2.4.0 → 3.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/dist/browser/index.js +1852 -14720
- package/dist/browser/index.js.map +1 -1
- package/dist/cjs/helpers.js +41 -15
- package/dist/cjs/helpers.js.map +1 -1
- package/dist/cjs/spl.js +25 -6
- package/dist/cjs/spl.js.map +1 -1
- package/dist/esm/helpers.js +41 -15
- package/dist/esm/helpers.js.map +1 -1
- package/dist/esm/spl.js +25 -6
- package/dist/esm/spl.js.map +1 -1
- package/dist/types/accounts.d.ts +6 -6
- package/dist/types/accounts.d.ts.map +1 -1
- package/dist/types/helpers.d.ts +39 -2
- package/dist/types/helpers.d.ts.map +1 -1
- package/dist/types/interfaces.d.ts +3 -3
- package/dist/types/interfaces.d.ts.map +1 -1
- package/dist/types/spl.d.ts +20 -23
- package/dist/types/spl.d.ts.map +1 -1
- package/package.json +4 -3
package/dist/cjs/helpers.js
CHANGED
|
@@ -85,7 +85,7 @@ class Wallet {
|
|
|
85
85
|
}
|
|
86
86
|
}
|
|
87
87
|
exports.Wallet = Wallet;
|
|
88
|
-
async function sendWithRetries(connection, serialized, lastValidBlockHeight, timesToSend = 5) {
|
|
88
|
+
async function sendWithRetries(connection, serialized, lastValidBlockHeight, timesToSend = 5, blockhashCommitment = "finalized") {
|
|
89
89
|
const txId = await connection.sendRawTransaction(serialized, {
|
|
90
90
|
skipPreflight: true,
|
|
91
91
|
maxRetries: 1000,
|
|
@@ -95,7 +95,8 @@ async function sendWithRetries(connection, serialized, lastValidBlockHeight, tim
|
|
|
95
95
|
while (blockheight < lastValidBlockHeight && sent < timesToSend) {
|
|
96
96
|
await connection.sendRawTransaction(serialized, {
|
|
97
97
|
skipPreflight: true,
|
|
98
|
-
|
|
98
|
+
preflightCommitment: blockhashCommitment,
|
|
99
|
+
maxRetries: 100,
|
|
99
100
|
});
|
|
100
101
|
await sleep(300);
|
|
101
102
|
blockheight = await connection.getBlockHeight();
|
|
@@ -116,27 +117,49 @@ function txToV0(transaction, payer, blockhash) {
|
|
|
116
117
|
return new web3_js_1.VersionedTransaction(v0Message);
|
|
117
118
|
}
|
|
118
119
|
}
|
|
119
|
-
|
|
120
|
+
function setBlockhash(transaction, blockhash) {
|
|
121
|
+
if (isVersionedTx(transaction)) {
|
|
122
|
+
transaction.message.recentBlockhash = blockhash;
|
|
123
|
+
}
|
|
124
|
+
else {
|
|
125
|
+
transaction.recentBlockhash = blockhash;
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
/**
|
|
129
|
+
*
|
|
130
|
+
* @param connection rpc connection
|
|
131
|
+
* @param wallet wallet interface to sign transaction
|
|
132
|
+
* @param transactions transaction(s) to send
|
|
133
|
+
* @param options additional {@link SendAllOptions|options}
|
|
134
|
+
* @returns
|
|
135
|
+
*/
|
|
136
|
+
async function sendAll(connection, wallet, transactions, options) {
|
|
137
|
+
const blockhashCommitment = options?.blockhashCommitment === undefined ? "finalized" : options.blockhashCommitment;
|
|
138
|
+
const fakeBlockHash = "1".repeat(32);
|
|
139
|
+
const convertIntoTxV0 = options?.convertIntoTxV0 === undefined ? true : options.convertIntoTxV0;
|
|
140
|
+
const debug = options?.debug === undefined ? false : options.debug;
|
|
141
|
+
const skipPreflight = options?.skipPreflight === undefined ? false : options.skipPreflight;
|
|
142
|
+
const rpcCalls = options?.rpcCalls === undefined ? 5 : options.rpcCalls;
|
|
143
|
+
if (!Array.isArray(transactions))
|
|
144
|
+
transactions = [transactions];
|
|
120
145
|
if (convertIntoTxV0) {
|
|
121
|
-
const fakeBlockHash = "1".repeat(32);
|
|
122
146
|
transactions = transactions.map((tx) => txToV0(tx, wallet.publicKey, fakeBlockHash));
|
|
123
147
|
}
|
|
124
148
|
let txIds = [];
|
|
125
|
-
if (waitBetweenSend === undefined || waitBetweenSend === 0) {
|
|
126
|
-
const { blockhash, lastValidBlockHeight } = await connection.getLatestBlockhash({ commitment: "confirmed" });
|
|
149
|
+
if (options?.waitBetweenSend === undefined || options.waitBetweenSend === 0) {
|
|
127
150
|
await Promise.all(transactions.map(async (tx) => {
|
|
128
151
|
let txV0;
|
|
129
152
|
if (isVersionedTx(tx)) {
|
|
130
|
-
tx.message.recentBlockhash =
|
|
153
|
+
tx.message.recentBlockhash = fakeBlockHash;
|
|
131
154
|
txV0 = tx;
|
|
132
155
|
}
|
|
133
156
|
else {
|
|
134
|
-
tx.recentBlockhash =
|
|
157
|
+
tx.recentBlockhash = fakeBlockHash;
|
|
135
158
|
tx.feePayer = wallet.publicKey;
|
|
136
159
|
txV0 = new web3_js_1.VersionedTransaction(web3_js_1.MessageV0.compile({
|
|
137
160
|
addressLookupTableAccounts: [],
|
|
138
161
|
instructions: tx.instructions,
|
|
139
|
-
recentBlockhash:
|
|
162
|
+
recentBlockhash: fakeBlockHash,
|
|
140
163
|
payerKey: tx.feePayer,
|
|
141
164
|
}));
|
|
142
165
|
}
|
|
@@ -151,19 +174,22 @@ async function sendAll(connection, wallet, transactions, signers, waitBetweenSen
|
|
|
151
174
|
}
|
|
152
175
|
}
|
|
153
176
|
}));
|
|
177
|
+
const { blockhash, lastValidBlockHeight } = await connection.getLatestBlockhash({ commitment: blockhashCommitment });
|
|
178
|
+
// set real blockhash
|
|
179
|
+
transactions.map((tx) => setBlockhash(tx, blockhash));
|
|
154
180
|
// sign after setting correct blockhashes
|
|
155
|
-
const signed = await wallet.signAllTransactions(transactions, signers);
|
|
181
|
+
const signed = await wallet.signAllTransactions(transactions, options?.signers);
|
|
156
182
|
txIds = await Promise.all(signed.map((signedTx) => {
|
|
157
183
|
const serialized = buffer_1.Buffer.from(signedTx.serialize());
|
|
158
184
|
if (debug)
|
|
159
185
|
console.debug(serialized.toString("base64"));
|
|
160
|
-
return sendWithRetries(connection, serialized, lastValidBlockHeight, rpcCalls);
|
|
186
|
+
return sendWithRetries(connection, serialized, lastValidBlockHeight, rpcCalls, blockhashCommitment);
|
|
161
187
|
}));
|
|
162
188
|
}
|
|
163
189
|
else {
|
|
164
190
|
for (let i = 0; i < transactions.length; i++) {
|
|
165
191
|
const tx = transactions[i];
|
|
166
|
-
const { blockhash, lastValidBlockHeight } = await connection.getLatestBlockhash();
|
|
192
|
+
const { blockhash, lastValidBlockHeight } = await connection.getLatestBlockhash({ commitment: blockhashCommitment });
|
|
167
193
|
let txV0;
|
|
168
194
|
if (isVersionedTx(tx)) {
|
|
169
195
|
tx.message.recentBlockhash = blockhash;
|
|
@@ -179,7 +205,7 @@ async function sendAll(connection, wallet, transactions, signers, waitBetweenSen
|
|
|
179
205
|
payerKey: tx.feePayer,
|
|
180
206
|
}));
|
|
181
207
|
}
|
|
182
|
-
const signed = await wallet.signTransaction(tx, signers && signers.length > i ? signers[i] : undefined);
|
|
208
|
+
const signed = await wallet.signTransaction(tx, options?.signers && options?.signers.length > i ? options.signers[i] : undefined);
|
|
183
209
|
if (!skipPreflight) {
|
|
184
210
|
const simulationResult = await connection.simulateTransaction(txV0, {
|
|
185
211
|
sigVerify: false,
|
|
@@ -193,8 +219,8 @@ async function sendAll(connection, wallet, transactions, signers, waitBetweenSen
|
|
|
193
219
|
const serialized = buffer_1.Buffer.from(signed.serialize());
|
|
194
220
|
if (debug)
|
|
195
221
|
console.debug(serialized.toString("base64"));
|
|
196
|
-
txIds.push(await sendWithRetries(connection, serialized, lastValidBlockHeight, rpcCalls));
|
|
197
|
-
await sleep(waitBetweenSend);
|
|
222
|
+
txIds.push(await sendWithRetries(connection, serialized, lastValidBlockHeight, rpcCalls, blockhashCommitment));
|
|
223
|
+
await sleep(options.waitBetweenSend);
|
|
198
224
|
}
|
|
199
225
|
}
|
|
200
226
|
return txIds;
|
package/dist/cjs/helpers.js.map
CHANGED
|
@@ -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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"}
|
package/dist/cjs/spl.js
CHANGED
|
@@ -2,12 +2,32 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.checkIfAssociatedWalletExists = exports.updateWsolBalance = exports.buildReplenishWsolBalanceTransaction = exports.getTokenAccountsWithBalance = exports.getAllTokenAccountsWithBalances = exports.getSPLWalletBalance = exports.getAssocSPLWalletBalance = exports.getNativeWalletBalance = exports.getAccountWithType = exports.isWalletCorrectATA = exports.parseSplAccount = exports.createAssociatedWalletInstruction = exports.AccountType = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
const spl_token_1 = require("@coral-xyz/spl-token");
|
|
6
5
|
const web3_js_1 = require("@solana/web3.js");
|
|
6
|
+
const bl = tslib_1.__importStar(require("@solana/buffer-layout"));
|
|
7
|
+
const blu = tslib_1.__importStar(require("@solana/buffer-layout-utils"));
|
|
7
8
|
const bn_js_1 = tslib_1.__importDefault(require("bn.js"));
|
|
8
9
|
const buffer_1 = require("buffer");
|
|
9
10
|
const accounts_1 = require("./accounts");
|
|
10
11
|
const helpers_1 = require("./helpers");
|
|
12
|
+
var AccountState;
|
|
13
|
+
(function (AccountState) {
|
|
14
|
+
AccountState[AccountState["Uninitialized"] = 0] = "Uninitialized";
|
|
15
|
+
AccountState[AccountState["Initialized"] = 1] = "Initialized";
|
|
16
|
+
AccountState[AccountState["Frozen"] = 2] = "Frozen";
|
|
17
|
+
})(AccountState || (AccountState = {}));
|
|
18
|
+
const AccountLayout = bl.struct([
|
|
19
|
+
blu.publicKey('mint'),
|
|
20
|
+
blu.publicKey('owner'),
|
|
21
|
+
blu.u64('amount'),
|
|
22
|
+
bl.u32('delegateOption'),
|
|
23
|
+
blu.publicKey('delegate'),
|
|
24
|
+
bl.u8('state'),
|
|
25
|
+
bl.u32('isNativeOption'),
|
|
26
|
+
blu.u64('isNative'),
|
|
27
|
+
blu.u64('delegatedAmount'),
|
|
28
|
+
bl.u32('closeAuthorityOption'),
|
|
29
|
+
blu.publicKey('closeAuthority'),
|
|
30
|
+
]);
|
|
11
31
|
var AccountType;
|
|
12
32
|
(function (AccountType) {
|
|
13
33
|
AccountType[AccountType["System"] = 0] = "System";
|
|
@@ -66,10 +86,8 @@ function createAssociatedWalletInstruction(tokenMint, associatedAccount, owner,
|
|
|
66
86
|
}
|
|
67
87
|
exports.createAssociatedWalletInstruction = createAssociatedWalletInstruction;
|
|
68
88
|
function parseSplAccount(data) {
|
|
69
|
-
const tokenProgram = (0, spl_token_1.splTokenProgram)({ provider: {} });
|
|
70
89
|
try {
|
|
71
|
-
|
|
72
|
-
return decoded;
|
|
90
|
+
return AccountLayout.decode(data);
|
|
73
91
|
}
|
|
74
92
|
catch (e) {
|
|
75
93
|
console.error(e);
|
|
@@ -229,9 +247,10 @@ async function updateWsolBalance(connection, amount, owner) {
|
|
|
229
247
|
const parsed = parseSplAccount(existingATA.data);
|
|
230
248
|
if (!parsed)
|
|
231
249
|
throw new Error("WSol account exists, but failed to decode its content");
|
|
232
|
-
|
|
250
|
+
const parsedAmount = new bn_js_1.default(parsed.amount.toString());
|
|
251
|
+
if (amountToWrap.lte(parsedAmount))
|
|
233
252
|
return null; // don't need to wrap
|
|
234
|
-
amountToWrap =
|
|
253
|
+
amountToWrap = parsedAmount.sub(amountToWrap);
|
|
235
254
|
}
|
|
236
255
|
const replenishTx = buildReplenishWsolBalanceTransaction(amountToWrap, owner, wSolATA);
|
|
237
256
|
tx.add(replenishTx);
|
package/dist/cjs/spl.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spl.js","sourceRoot":"","sources":["../../src/spl.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"spl.js","sourceRoot":"","sources":["../../src/spl.ts"],"names":[],"mappings":";;;;AAAA,6CAAyH;AACzH,kEAA4C;AAC5C,yEAAmD;AACnD,0DAAuB;AACvB,mCAAgC;AAChC,yCAAyH;AACzH,uCAA2C;AAK3C,IAAK,YAIJ;AAJD,WAAK,YAAY;IAChB,iEAAiB,CAAA;IACjB,6DAAe,CAAA;IACf,mDAAU,CAAA;AACX,CAAC,EAJI,YAAY,KAAZ,YAAY,QAIhB;AAeD,MAAM,aAAa,GAAG,EAAE,CAAC,MAAM,CAAa;IAC3C,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC;IACrB,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC;IACtB,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC;IACjB,EAAE,CAAC,GAAG,CAAC,gBAAgB,CAAC;IACxB,GAAG,CAAC,SAAS,CAAC,UAAU,CAAC;IACzB,EAAE,CAAC,EAAE,CAAC,OAAO,CAAC;IACd,EAAE,CAAC,GAAG,CAAC,gBAAgB,CAAC;IACxB,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC;IACnB,GAAG,CAAC,GAAG,CAAC,iBAAiB,CAAC;IAC1B,EAAE,CAAC,GAAG,CAAC,sBAAsB,CAAC;IAC9B,GAAG,CAAC,SAAS,CAAC,gBAAgB,CAAC;CAC/B,CAAC,CAAC;AAEH,IAAY,WAMX;AAND,WAAY,WAAW;IACtB,iDAAU,CAAA;IACV,+CAAS,CAAA;IACT,yDAAc,CAAA;IACd,mDAAW,CAAA;IACX,uDAAa,CAAA;AACd,CAAC,EANW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAMtB;AAkBD;;;;;;GAMG;AACH,SAAgB,iCAAiC,CAChD,SAAuB,EACvB,iBAA4B,EAC5B,KAAmB,EACnB,KAAmB,EACnB,uBAAmC;IAEnC,SAAS,GAAG,IAAI,mBAAS,CAAC,SAAS,CAAC,CAAC;IACrC,KAAK,GAAG,IAAI,mBAAS,CAAC,KAAK,CAAC,CAAC;IAC7B,KAAK,GAAG,IAAI,mBAAS,CAAC,KAAK,CAAC,CAAC;IAE7B,OAAO,IAAI,gCAAsB,CAAC;QACjC,SAAS,EAAE,uBAAuB,IAAI,sCAA2B;QACjE,IAAI,EAAE,eAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QACtB,IAAI,EAAE;YACL;gBACC,MAAM,EAAE,KAAK;gBACb,QAAQ,EAAE,IAAI;gBACd,UAAU,EAAE,IAAI;aAChB;YACD;gBACC,MAAM,EAAE,iBAAiB;gBACzB,QAAQ,EAAE,KAAK;gBACf,UAAU,EAAE,IAAI;aAChB;YACD;gBACC,MAAM,EAAE,KAAK;gBACb,QAAQ,EAAE,KAAK;gBACf,UAAU,EAAE,KAAK;aACjB;YACD;gBACC,MAAM,EAAE,SAAS;gBACjB,QAAQ,EAAE,KAAK;gBACf,UAAU,EAAE,KAAK;aACjB;YACD;gBACC,MAAM,EAAE,uBAAa,CAAC,SAAS;gBAC/B,QAAQ,EAAE,KAAK;gBACf,UAAU,EAAE,KAAK;aACjB;YACD;gBACC,MAAM,EAAE,2BAAgB;gBACxB,QAAQ,EAAE,KAAK;gBACf,UAAU,EAAE,KAAK;aACjB;SACD;KACD,CAAC,CAAC;AACJ,CAAC;AA/CD,8EA+CC;AAED,SAAgB,eAAe,CAAC,IAAY;IAC3C,IAAI;QACH,OAAO,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;KAClC;IAAC,OAAO,CAAC,EAAE;QACX,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;KACjB;IACD,OAAO,IAAI,CAAC;AACb,CAAC;AAPD,0CAOC;AAED,SAAgB,kBAAkB,CAAC,aAA2B,EAAE,IAAY;IAC3E,MAAM,OAAO,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;IACtC,IAAI,CAAC,OAAO;QAAE,OAAO,KAAK,CAAC;IAC3B,MAAM,CAAC,OAAO,CAAC,GAAG,IAAA,qCAA0B,EAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAE1E,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,mBAAS,CAAC,aAAa,CAAC,CAAC,CAAC;AACrD,CAAC;AAND,gDAMC;AAED;;;;GAIG;AACI,KAAK,UAAU,kBAAkB,CACvC,UAAsB,EACtB,OAAqB;IAErB,OAAO,GAAG,IAAI,mBAAS,CAAC,OAAO,CAAC,CAAC;IACjC,MAAM,WAAW,GAAG,MAAM,IAAA,wBAAc,EAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAC9D,IAAI,CAAC,WAAW;QAAE,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IACvD,IAAI,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,2BAAgB,CAAC,EAAE;QAC/C,OAAO,kBAAkB,CAAC,OAAO,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC;KAChI;IACD,IAAI,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,uBAAa,CAAC,SAAS,CAAC;QAAE,OAAO,CAAC,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAEhG,OAAO,CAAC,WAAW,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;AAC3C,CAAC;AAbD,gDAaC;AAED;;;GAGG;AACI,KAAK,UAAU,sBAAsB,CAAC,UAAsB,EAAE,MAAoB;IACxF,MAAM,GAAG,IAAI,mBAAS,CAAC,MAAM,CAAC,CAAC;IAC/B,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IAEnD,OAAO,IAAI,eAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;AAClC,CAAC;AALD,wDAKC;AAED;;;;GAIG;AACI,KAAK,UAAU,wBAAwB,CAAC,UAAsB,EAAE,cAA4B,EAAE,SAAuB;IAC3H,cAAc,GAAG,IAAI,mBAAS,CAAC,cAAc,CAAC,CAAC;IAC/C,SAAS,GAAG,IAAI,mBAAS,CAAC,SAAS,CAAC,CAAC;IACrC,MAAM,CAAC,MAAM,CAAC,GAAG,IAAA,qCAA0B,EAAC,cAAc,EAAE,SAAS,CAAC,CAAC;IACvE,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,sBAAsB,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAE5E,OAAO,IAAI,eAAE,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;AACpC,CAAC;AAPD,4DAOC;AAED;;;GAGG;AACI,KAAK,UAAU,mBAAmB,CAAC,UAAsB,EAAE,MAAoB;IACrF,MAAM,GAAG,IAAI,mBAAS,CAAC,MAAM,CAAC,CAAC;IAC/B,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,sBAAsB,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAE5E,OAAO,IAAI,eAAE,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;AACpC,CAAC;AALD,kDAKC;AAED;;;;GAIG;AACI,KAAK,UAAU,+BAA+B,CAAC,UAAsB,EAAE,KAAmB;IAChG,MAAM,WAAW,GAAG,MAAM,UAAU,CAAC,6BAA6B,CAAC,IAAI,mBAAS,CAAC,KAAK,CAAC,EAAE,EAAE,SAAS,EAAE,2BAAgB,EAAE,CAAC,CAAC;IAC1H,MAAM,OAAO,GAAG,WAAW,CAAC,KAAK,CAAC;IAuBlC,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QAC7B,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAA4B,CAAC;QAEnE,OAAO;YACN,OAAO,EAAE,MAAM,CAAC,MAAM;YACtB,IAAI,EAAE,IAAI,mBAAS,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC;YACxC,MAAM,EAAE,IAAI,eAAE,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC;YACjD,QAAQ,EAAE,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ;YAC7C,aAAa,EAAE,IAAI;YACnB,QAAQ,EAAE,SAAS,CAAC,IAAI,CAAC,QAAQ;YACjC,KAAK,EAAE,IAAI,mBAAS,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC;SAC1C,CAAC;IACH,CAAC,CAAC,CAAC;AACJ,CAAC;AAtCD,0EAsCC;AAED;;;;;GAKG;AACI,KAAK,UAAU,2BAA2B,CAChD,UAAsB,EACtB,SAAuB,EACvB,KAAmB;IAEnB,MAAM,WAAW,GAAG,MAAM,UAAU,CAAC,6BAA6B,CAAC,IAAI,mBAAS,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,mBAAS,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;IAC7H,MAAM,OAAO,GAAG,WAAW,CAAC,KAAK,CAAC;IAuBlC,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QAC7B,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAA4B,CAAC;QAEnE,OAAO;YACN,OAAO,EAAE,MAAM,CAAC,MAAM;YACtB,IAAI,EAAE,IAAI,mBAAS,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC;YACxC,MAAM,EAAE,IAAI,eAAE,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC;YACjD,QAAQ,EAAE,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ;YAC7C,aAAa,EAAE,IAAI;YACnB,QAAQ,EAAE,SAAS,CAAC,IAAI,CAAC,QAAQ;YACjC,KAAK,EAAE,IAAI,mBAAS,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC;SAC1C,CAAC;IACH,CAAC,CAAC,CAAC;AACJ,CAAC;AA1CD,kEA0CC;AAED;;;;;;GAMG;AACH,SAAgB,oCAAoC,CAAC,MAAkB,EAAE,YAA0B,EAAE,UAAwB;IAC5H,YAAY,GAAG,IAAI,mBAAS,CAAC,YAAY,CAAC,CAAC;IAC3C,UAAU,GAAG,IAAI,mBAAS,CAAC,UAAU,CAAC,CAAC;IAEvC,MAAM,EAAE,GAAG,IAAI,qBAAW,EAAE,CAAC;IAC7B,EAAE,CAAC,GAAG,CAAC,uBAAa,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,eAAE,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;IACxH,EAAE,CAAC,GAAG;IACL,cAAc;IACd,IAAI,gCAAsB,CAAC;QAC1B,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;QACjE,SAAS,EAAE,2BAAgB;QAC3B,IAAI,EAAE,eAAM,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC;KACvB,CAAC,CACF,CAAC;IAEF,EAAE,CAAC,QAAQ,GAAG,YAAY,CAAC;IAE3B,OAAO,EAAE,CAAC;AACX,CAAC;AAlBD,oFAkBC;AAED;;;;GAIG;AACI,KAAK,UAAU,iBAAiB,CAAC,UAAsB,EAAE,MAAkB,EAAE,KAAmB;IACtG,KAAK,GAAG,IAAI,mBAAS,CAAC,KAAK,CAAC,CAAC;IAC7B,MAAM,EAAE,GAAG,IAAI,qBAAW,EAAE,CAAC;IAC7B,MAAM,WAAW,GAAG,GAAG,CAAC;IACxB,MAAM,CAAC,OAAO,CAAC,GAAG,IAAA,qCAA0B,EAAC,KAAK,EAAE,2BAAgB,CAAC,CAAC;IACtE,MAAM,WAAW,GAAG,MAAM,IAAA,wBAAc,EAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAC9D,IAAI,YAAY,GAAG,IAAI,eAAE,CAAC,MAAM,CAAC,CAAC;IAClC,IAAI,WAAW,KAAK,IAAI,EAAE;QACzB,EAAE,CAAC,GAAG,CACL,uBAAa,CAAC,aAAa,CAAC;YAC3B,UAAU,EAAE,KAAK;YACjB,KAAK,EAAE,WAAW;YAClB,SAAS,EAAE,2BAAgB;YAC3B,gBAAgB,EAAE,OAAO;YACzB,QAAQ,EAAE,MAAM,UAAU,CAAC,iCAAiC,CAAC,WAAW,CAAC;SACzE,CAAC,CACF,CAAC;KACF;SAAM;QACN,MAAM,MAAM,GAAG,eAAe,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACjD,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;QACtF,MAAM,YAAY,GAAG,IAAI,eAAE,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;QACtD,IAAI,YAAY,CAAC,GAAG,CAAC,YAAY,CAAC;YAAE,OAAO,IAAI,CAAC,CAAC,qBAAqB;QACtE,YAAY,GAAG,YAAY,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;KAC9C;IACD,MAAM,WAAW,GAAG,oCAAoC,CAAC,YAAY,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IACvF,EAAE,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAEpB,OAAO,EAAE,CAAC;AACX,CAAC;AA5BD,8CA4BC;AAED;;;;;GAKG;AACI,KAAK,UAAU,6BAA6B,CAAC,UAAsB,EAAE,WAAsB,EAAE,cAAyB;IAC5H,MAAM,CAAC,aAAa,CAAC,GAAG,IAAA,qCAA0B,EAAC,cAAc,EAAE,WAAW,CAAC,CAAC;IAChF,MAAM,WAAW,GAAG,MAAM,IAAA,wBAAc,EAAC,UAAU,EAAE,aAAa,CAAC,CAAC;IAEpE,OAAO,WAAW,KAAK,IAAI,CAAC;AAC7B,CAAC;AALD,sEAKC"}
|
package/dist/esm/helpers.js
CHANGED
|
@@ -85,7 +85,7 @@ export class Wallet {
|
|
|
85
85
|
});
|
|
86
86
|
}
|
|
87
87
|
}
|
|
88
|
-
function sendWithRetries(connection, serialized, lastValidBlockHeight, timesToSend = 5) {
|
|
88
|
+
function sendWithRetries(connection, serialized, lastValidBlockHeight, timesToSend = 5, blockhashCommitment = "finalized") {
|
|
89
89
|
return __awaiter(this, void 0, void 0, function* () {
|
|
90
90
|
const txId = yield connection.sendRawTransaction(serialized, {
|
|
91
91
|
skipPreflight: true,
|
|
@@ -96,7 +96,8 @@ function sendWithRetries(connection, serialized, lastValidBlockHeight, timesToSe
|
|
|
96
96
|
while (blockheight < lastValidBlockHeight && sent < timesToSend) {
|
|
97
97
|
yield connection.sendRawTransaction(serialized, {
|
|
98
98
|
skipPreflight: true,
|
|
99
|
-
|
|
99
|
+
preflightCommitment: blockhashCommitment,
|
|
100
|
+
maxRetries: 100,
|
|
100
101
|
});
|
|
101
102
|
yield sleep(300);
|
|
102
103
|
blockheight = yield connection.getBlockHeight();
|
|
@@ -118,30 +119,52 @@ function txToV0(transaction, payer, blockhash) {
|
|
|
118
119
|
return new VersionedTransaction(v0Message);
|
|
119
120
|
}
|
|
120
121
|
}
|
|
121
|
-
|
|
122
|
+
function setBlockhash(transaction, blockhash) {
|
|
123
|
+
if (isVersionedTx(transaction)) {
|
|
124
|
+
transaction.message.recentBlockhash = blockhash;
|
|
125
|
+
}
|
|
126
|
+
else {
|
|
127
|
+
transaction.recentBlockhash = blockhash;
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
/**
|
|
131
|
+
*
|
|
132
|
+
* @param connection rpc connection
|
|
133
|
+
* @param wallet wallet interface to sign transaction
|
|
134
|
+
* @param transactions transaction(s) to send
|
|
135
|
+
* @param options additional {@link SendAllOptions|options}
|
|
136
|
+
* @returns
|
|
137
|
+
*/
|
|
138
|
+
export function sendAll(connection, wallet, transactions, options) {
|
|
122
139
|
var _a;
|
|
123
140
|
return __awaiter(this, void 0, void 0, function* () {
|
|
141
|
+
const blockhashCommitment = (options === null || options === void 0 ? void 0 : options.blockhashCommitment) === undefined ? "finalized" : options.blockhashCommitment;
|
|
142
|
+
const fakeBlockHash = "1".repeat(32);
|
|
143
|
+
const convertIntoTxV0 = (options === null || options === void 0 ? void 0 : options.convertIntoTxV0) === undefined ? true : options.convertIntoTxV0;
|
|
144
|
+
const debug = (options === null || options === void 0 ? void 0 : options.debug) === undefined ? false : options.debug;
|
|
145
|
+
const skipPreflight = (options === null || options === void 0 ? void 0 : options.skipPreflight) === undefined ? false : options.skipPreflight;
|
|
146
|
+
const rpcCalls = (options === null || options === void 0 ? void 0 : options.rpcCalls) === undefined ? 5 : options.rpcCalls;
|
|
147
|
+
if (!Array.isArray(transactions))
|
|
148
|
+
transactions = [transactions];
|
|
124
149
|
if (convertIntoTxV0) {
|
|
125
|
-
const fakeBlockHash = "1".repeat(32);
|
|
126
150
|
transactions = transactions.map((tx) => txToV0(tx, wallet.publicKey, fakeBlockHash));
|
|
127
151
|
}
|
|
128
152
|
let txIds = [];
|
|
129
|
-
if (waitBetweenSend === undefined || waitBetweenSend === 0) {
|
|
130
|
-
const { blockhash, lastValidBlockHeight } = yield connection.getLatestBlockhash({ commitment: "confirmed" });
|
|
153
|
+
if ((options === null || options === void 0 ? void 0 : options.waitBetweenSend) === undefined || options.waitBetweenSend === 0) {
|
|
131
154
|
yield Promise.all(transactions.map((tx) => __awaiter(this, void 0, void 0, function* () {
|
|
132
155
|
var _b;
|
|
133
156
|
let txV0;
|
|
134
157
|
if (isVersionedTx(tx)) {
|
|
135
|
-
tx.message.recentBlockhash =
|
|
158
|
+
tx.message.recentBlockhash = fakeBlockHash;
|
|
136
159
|
txV0 = tx;
|
|
137
160
|
}
|
|
138
161
|
else {
|
|
139
|
-
tx.recentBlockhash =
|
|
162
|
+
tx.recentBlockhash = fakeBlockHash;
|
|
140
163
|
tx.feePayer = wallet.publicKey;
|
|
141
164
|
txV0 = new VersionedTransaction(MessageV0.compile({
|
|
142
165
|
addressLookupTableAccounts: [],
|
|
143
166
|
instructions: tx.instructions,
|
|
144
|
-
recentBlockhash:
|
|
167
|
+
recentBlockhash: fakeBlockHash,
|
|
145
168
|
payerKey: tx.feePayer,
|
|
146
169
|
}));
|
|
147
170
|
}
|
|
@@ -156,19 +179,22 @@ export function sendAll(connection, wallet, transactions, signers, waitBetweenSe
|
|
|
156
179
|
}
|
|
157
180
|
}
|
|
158
181
|
})));
|
|
182
|
+
const { blockhash, lastValidBlockHeight } = yield connection.getLatestBlockhash({ commitment: blockhashCommitment });
|
|
183
|
+
// set real blockhash
|
|
184
|
+
transactions.map((tx) => setBlockhash(tx, blockhash));
|
|
159
185
|
// sign after setting correct blockhashes
|
|
160
|
-
const signed = yield wallet.signAllTransactions(transactions, signers);
|
|
186
|
+
const signed = yield wallet.signAllTransactions(transactions, options === null || options === void 0 ? void 0 : options.signers);
|
|
161
187
|
txIds = yield Promise.all(signed.map((signedTx) => {
|
|
162
188
|
const serialized = Buffer.from(signedTx.serialize());
|
|
163
189
|
if (debug)
|
|
164
190
|
console.debug(serialized.toString("base64"));
|
|
165
|
-
return sendWithRetries(connection, serialized, lastValidBlockHeight, rpcCalls);
|
|
191
|
+
return sendWithRetries(connection, serialized, lastValidBlockHeight, rpcCalls, blockhashCommitment);
|
|
166
192
|
}));
|
|
167
193
|
}
|
|
168
194
|
else {
|
|
169
195
|
for (let i = 0; i < transactions.length; i++) {
|
|
170
196
|
const tx = transactions[i];
|
|
171
|
-
const { blockhash, lastValidBlockHeight } = yield connection.getLatestBlockhash();
|
|
197
|
+
const { blockhash, lastValidBlockHeight } = yield connection.getLatestBlockhash({ commitment: blockhashCommitment });
|
|
172
198
|
let txV0;
|
|
173
199
|
if (isVersionedTx(tx)) {
|
|
174
200
|
tx.message.recentBlockhash = blockhash;
|
|
@@ -184,7 +210,7 @@ export function sendAll(connection, wallet, transactions, signers, waitBetweenSe
|
|
|
184
210
|
payerKey: tx.feePayer,
|
|
185
211
|
}));
|
|
186
212
|
}
|
|
187
|
-
const signed = yield wallet.signTransaction(tx, signers && signers.length > i ? signers[i] : undefined);
|
|
213
|
+
const signed = yield wallet.signTransaction(tx, (options === null || options === void 0 ? void 0 : options.signers) && (options === null || options === void 0 ? void 0 : options.signers.length) > i ? options.signers[i] : undefined);
|
|
188
214
|
if (!skipPreflight) {
|
|
189
215
|
const simulationResult = yield connection.simulateTransaction(txV0, {
|
|
190
216
|
sigVerify: false,
|
|
@@ -198,8 +224,8 @@ export function sendAll(connection, wallet, transactions, signers, waitBetweenSe
|
|
|
198
224
|
const serialized = Buffer.from(signed.serialize());
|
|
199
225
|
if (debug)
|
|
200
226
|
console.debug(serialized.toString("base64"));
|
|
201
|
-
txIds.push(yield sendWithRetries(connection, serialized, lastValidBlockHeight, rpcCalls));
|
|
202
|
-
yield sleep(waitBetweenSend);
|
|
227
|
+
txIds.push(yield sendWithRetries(connection, serialized, lastValidBlockHeight, rpcCalls, blockhashCommitment));
|
|
228
|
+
yield sleep(options.waitBetweenSend);
|
|
203
229
|
}
|
|
204
230
|
}
|
|
205
231
|
return txIds;
|
package/dist/esm/helpers.js.map
CHANGED
|
@@ -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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"}
|
package/dist/esm/spl.js
CHANGED
|
@@ -1,10 +1,30 @@
|
|
|
1
1
|
import { __awaiter } from "tslib";
|
|
2
|
-
import { splTokenProgram } from "@coral-xyz/spl-token";
|
|
3
2
|
import { PublicKey, SystemProgram, Transaction, TransactionInstruction } from "@solana/web3.js";
|
|
3
|
+
import * as bl from "@solana/buffer-layout";
|
|
4
|
+
import * as blu from "@solana/buffer-layout-utils";
|
|
4
5
|
import BN from "bn.js";
|
|
5
6
|
import { Buffer } from "buffer";
|
|
6
7
|
import { ASSOCIATED_TOKEN_PROGRAM_ID, findAssociatedTokenAddress, TOKEN_PROGRAM_ID, WRAPPED_SOL_MINT } from "./accounts";
|
|
7
8
|
import { getAccountInfo } from "./helpers";
|
|
9
|
+
var AccountState;
|
|
10
|
+
(function (AccountState) {
|
|
11
|
+
AccountState[AccountState["Uninitialized"] = 0] = "Uninitialized";
|
|
12
|
+
AccountState[AccountState["Initialized"] = 1] = "Initialized";
|
|
13
|
+
AccountState[AccountState["Frozen"] = 2] = "Frozen";
|
|
14
|
+
})(AccountState || (AccountState = {}));
|
|
15
|
+
const AccountLayout = bl.struct([
|
|
16
|
+
blu.publicKey('mint'),
|
|
17
|
+
blu.publicKey('owner'),
|
|
18
|
+
blu.u64('amount'),
|
|
19
|
+
bl.u32('delegateOption'),
|
|
20
|
+
blu.publicKey('delegate'),
|
|
21
|
+
bl.u8('state'),
|
|
22
|
+
bl.u32('isNativeOption'),
|
|
23
|
+
blu.u64('isNative'),
|
|
24
|
+
blu.u64('delegatedAmount'),
|
|
25
|
+
bl.u32('closeAuthorityOption'),
|
|
26
|
+
blu.publicKey('closeAuthority'),
|
|
27
|
+
]);
|
|
8
28
|
export var AccountType;
|
|
9
29
|
(function (AccountType) {
|
|
10
30
|
AccountType[AccountType["System"] = 0] = "System";
|
|
@@ -62,10 +82,8 @@ export function createAssociatedWalletInstruction(tokenMint, associatedAccount,
|
|
|
62
82
|
});
|
|
63
83
|
}
|
|
64
84
|
export function parseSplAccount(data) {
|
|
65
|
-
const tokenProgram = splTokenProgram({ provider: {} });
|
|
66
85
|
try {
|
|
67
|
-
|
|
68
|
-
return decoded;
|
|
86
|
+
return AccountLayout.decode(data);
|
|
69
87
|
}
|
|
70
88
|
catch (e) {
|
|
71
89
|
console.error(e);
|
|
@@ -229,9 +247,10 @@ export function updateWsolBalance(connection, amount, owner) {
|
|
|
229
247
|
const parsed = parseSplAccount(existingATA.data);
|
|
230
248
|
if (!parsed)
|
|
231
249
|
throw new Error("WSol account exists, but failed to decode its content");
|
|
232
|
-
|
|
250
|
+
const parsedAmount = new BN(parsed.amount.toString());
|
|
251
|
+
if (amountToWrap.lte(parsedAmount))
|
|
233
252
|
return null; // don't need to wrap
|
|
234
|
-
amountToWrap =
|
|
253
|
+
amountToWrap = parsedAmount.sub(amountToWrap);
|
|
235
254
|
}
|
|
236
255
|
const replenishTx = buildReplenishWsolBalanceTransaction(amountToWrap, owner, wSolATA);
|
|
237
256
|
tx.add(replenishTx);
|
package/dist/esm/spl.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spl.js","sourceRoot":"","sources":["../../src/spl.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"spl.js","sourceRoot":"","sources":["../../src/spl.ts"],"names":[],"mappings":"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"}
|
package/dist/types/accounts.d.ts
CHANGED
|
@@ -11,14 +11,14 @@ export declare function findAssociatedTokenAddress(wallet: PublicKey, tokenMint:
|
|
|
11
11
|
*/
|
|
12
12
|
export declare function findAssociatedTokenAddressSync(wallet: PublicKey, tokenMint: PublicKey, tokenProgramId?: PublicKey, associatedTokenProramId?: PublicKey): [PublicKey, number];
|
|
13
13
|
export declare function getTokenMetadataAddress(tokenMint: PublicKey, tokenMetedataProgramId: PublicKey): [PublicKey, number];
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
14
|
+
type Head<T extends unknown[]> = T extends [...infer Head, unknown] ? Head : unknown[];
|
|
15
|
+
type EmptyTuple = [];
|
|
16
|
+
type OmitLastParam<F> = F extends (...args: infer P) => infer Ret ? Head<P> extends EmptyTuple ? () => Ret : (...args: Head<P>) => Ret : never;
|
|
17
|
+
type FnContainer = {
|
|
18
18
|
[K: string]: AnyFn;
|
|
19
19
|
};
|
|
20
|
-
|
|
21
|
-
|
|
20
|
+
type AnyFn = (...args: any[]) => any;
|
|
21
|
+
type AccountResolver<T> = {
|
|
22
22
|
readonly methods: {
|
|
23
23
|
[K in keyof T]: OmitLastParam<T[K]>;
|
|
24
24
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accounts.d.ts","sourceRoot":"","sources":["../../src/accounts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAI5C,OAAO,EAAE,MAAM,EAAY,YAAY,EAAE,MAAM,cAAc,CAAC;AAE9D,eAAO,MAAM,yBAAyB,WAA+D,CAAC;AACtG,eAAO,MAAM,gBAAgB,WAA+D,CAAC;AAC7F,eAAO,MAAM,2BAA2B,WAAgE,CAAC;AACzG,eAAO,MAAM,gBAAgB,WAA+D,CAAC;AAE7F,wBAAgB,0BAA0B,CACzC,MAAM,EAAE,SAAS,EACjB,SAAS,EAAE,SAAS,EACpB,cAAc,GAAE,SAA4B,EAC5C,uBAAuB,GAAE,SAAuC,uBAGhE;AAED;;GAEG;AACH,wBAAgB,8BAA8B,CAC7C,MAAM,EAAE,SAAS,EACjB,SAAS,EAAE,SAAS,EACpB,cAAc,GAAE,SAA4B,EAC5C,uBAAuB,GAAE,SAAuC,uBAGhE;AAED,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,SAAS,EAAE,sBAAsB,EAAE,SAAS,uBAK9F;AAmHD,
|
|
1
|
+
{"version":3,"file":"accounts.d.ts","sourceRoot":"","sources":["../../src/accounts.ts"],"names":[],"mappings":"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"}
|
package/dist/types/helpers.d.ts
CHANGED
|
@@ -13,7 +13,7 @@ export declare function sleep(milliSeconds: number): Promise<void>;
|
|
|
13
13
|
* @returns transaction size
|
|
14
14
|
*/
|
|
15
15
|
export declare function getTransactionSize(transaction: Transaction, feePayer?: PublicKey): number;
|
|
16
|
-
|
|
16
|
+
type AnyTransaction = Transaction | VersionedTransaction;
|
|
17
17
|
export declare class Wallet implements interfaces.IWallet {
|
|
18
18
|
private keypair;
|
|
19
19
|
publicKey: PublicKey;
|
|
@@ -21,6 +21,43 @@ export declare class Wallet implements interfaces.IWallet {
|
|
|
21
21
|
signTransaction<T extends Transaction | VersionedTransaction>(tx: T, additionalSigners?: Signer[]): Promise<T>;
|
|
22
22
|
signAllTransactions<T extends Transaction | VersionedTransaction>(txs: T[], additionalSigners?: (Signer[] | undefined)[]): Promise<Awaited<T>[]>;
|
|
23
23
|
}
|
|
24
|
-
|
|
24
|
+
type SendAllOptions = {
|
|
25
|
+
/**
|
|
26
|
+
* List of signers for each tx
|
|
27
|
+
* E.g. you provided [tx1, tx2], tx2 requires additional signature
|
|
28
|
+
* signers should be [[], [tx2Signer]]
|
|
29
|
+
*/
|
|
30
|
+
signers?: Keypair[][];
|
|
31
|
+
/**
|
|
32
|
+
* Wait for number of milliseconds, if not provided will send all transactions simultaneously
|
|
33
|
+
*/
|
|
34
|
+
waitBetweenSend?: number;
|
|
35
|
+
skipPreflight?: boolean;
|
|
36
|
+
/**
|
|
37
|
+
* Dump serialized transaction before send? Default is `false`
|
|
38
|
+
*/
|
|
39
|
+
debug?: boolean;
|
|
40
|
+
/**
|
|
41
|
+
* Convert all transactions from legacy to TransactionV0? Default is `true`
|
|
42
|
+
*/
|
|
43
|
+
convertIntoTxV0?: boolean;
|
|
44
|
+
/**
|
|
45
|
+
* Number of `sendTrnasaction` rpc calls for each transaction
|
|
46
|
+
*/
|
|
47
|
+
rpcCalls?: number;
|
|
48
|
+
/**
|
|
49
|
+
* Set blockhash with provided level for each transaction before sign & send. Default is `finalized`
|
|
50
|
+
*/
|
|
51
|
+
blockhashCommitment?: Commitment;
|
|
52
|
+
};
|
|
53
|
+
/**
|
|
54
|
+
*
|
|
55
|
+
* @param connection rpc connection
|
|
56
|
+
* @param wallet wallet interface to sign transaction
|
|
57
|
+
* @param transactions transaction(s) to send
|
|
58
|
+
* @param options additional {@link SendAllOptions|options}
|
|
59
|
+
* @returns
|
|
60
|
+
*/
|
|
61
|
+
export declare function sendAll(connection: Connection, wallet: interfaces.IWallet, transactions: AnyTransaction[] | AnyTransaction, options?: SendAllOptions): Promise<string[]>;
|
|
25
62
|
export {};
|
|
26
63
|
//# 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,UAAU,EAAE,OAAO,EAAa,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACnI,OAAO,EAAE,UAAU,EAAE,MAAM,GAAG,CAAC;AAE/B,wBAAsB,cAAc,CAAC,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,GAAE,UAAwB,iEAUpH;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,
|
|
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,UAAU,EAAE,OAAO,EAAa,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACnI,OAAO,EAAE,UAAU,EAAE,MAAM,GAAG,CAAC;AAE/B,wBAAsB,cAAc,CAAC,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,GAAE,UAAwB,iEAUpH;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,KAAK,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;AA2CD,KAAK,cAAc,GAAG;IACrB;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,EAAE,EAAE,CAAC;IACtB;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,mBAAmB,CAAC,EAAE,UAAU,CAAC;CACjC,CAAA;AAED;;;;;;;GAOG;AACH,wBAAsB,OAAO,CAC5B,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,UAAU,CAAC,OAAO,EAC1B,YAAY,EAAE,cAAc,EAAE,GAAG,cAAc,EAC/C,OAAO,CAAC,EAAE,cAAc,qBA2GxB"}
|