@debridge-finance/solana-utils 4.2.1 → 4.3.1
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 +216 -129
- package/dist/browser/index.js.map +1 -1
- package/dist/cjs/accounts.js +62 -27
- package/dist/cjs/accounts.js.map +1 -1
- package/dist/cjs/constants.js +3 -3
- package/dist/cjs/constants.js.map +1 -1
- package/dist/cjs/crypto.js +7 -1
- package/dist/cjs/crypto.js.map +1 -1
- package/dist/cjs/helpers.js +75 -64
- package/dist/cjs/helpers.js.map +1 -1
- package/dist/cjs/index.js +2 -1
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/interfaces.js.map +1 -1
- package/dist/cjs/programs.js +9 -0
- package/dist/cjs/programs.js.map +1 -0
- package/dist/cjs/solidityPack.js +10 -8
- package/dist/cjs/solidityPack.js.map +1 -1
- package/dist/cjs/spl.js +31 -16
- package/dist/cjs/spl.js.map +1 -1
- package/dist/esm/accounts.js +59 -24
- package/dist/esm/accounts.js.map +1 -1
- package/dist/esm/constants.js +2 -2
- package/dist/esm/constants.js.map +1 -1
- package/dist/esm/crypto.js +8 -2
- package/dist/esm/crypto.js.map +1 -1
- package/dist/esm/helpers.js +81 -68
- package/dist/esm/helpers.js.map +1 -1
- package/dist/esm/index.js +1 -0
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/interfaces.js.map +1 -1
- package/dist/esm/programs.js +6 -0
- package/dist/esm/programs.js.map +1 -0
- package/dist/esm/solidityPack.js +10 -8
- package/dist/esm/solidityPack.js.map +1 -1
- package/dist/esm/spl.js +33 -18
- package/dist/esm/spl.js.map +1 -1
- package/dist/types/accounts.d.ts +2 -2
- package/dist/types/accounts.d.ts.map +1 -1
- package/dist/types/constants.d.ts +2 -2
- package/dist/types/crypto.d.ts.map +1 -1
- package/dist/types/helpers.d.ts +4 -5
- package/dist/types/helpers.d.ts.map +1 -1
- package/dist/types/index.d.ts +1 -0
- package/dist/types/index.d.ts.map +1 -1
- package/dist/types/interfaces.d.ts.map +1 -1
- package/dist/types/programs.d.ts +6 -0
- package/dist/types/programs.d.ts.map +1 -0
- package/dist/types/solidityPack.d.ts.map +1 -1
- package/dist/types/spl.d.ts.map +1 -1
- package/package.json +3 -3
package/dist/esm/helpers.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { __awaiter } from "tslib";
|
|
2
2
|
import { Buffer } from "buffer";
|
|
3
|
-
import { MessageV0, Transaction, VersionedTransaction } from "@solana/web3.js";
|
|
3
|
+
import { MessageV0, Transaction, VersionedTransaction, } from "@solana/web3.js";
|
|
4
4
|
import { FAKE_BLOCKHASH } from "./constants";
|
|
5
5
|
export function getAccountInfo(connection, account, commitment = "confirmed") {
|
|
6
6
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -26,7 +26,10 @@ export function hexToBuffer(data, align) {
|
|
|
26
26
|
data = data.length % 2 ? "0" + data : data; // append leading zero if data is not aligned, eg "fff" => "0f ff"
|
|
27
27
|
align = align || 0;
|
|
28
28
|
if (align && bufferLen < align) {
|
|
29
|
-
return Buffer.concat([
|
|
29
|
+
return Buffer.concat([
|
|
30
|
+
Buffer.from(Uint8Array.from({ length: align - bufferLen }).fill(0)),
|
|
31
|
+
Buffer.from(data, "hex"),
|
|
32
|
+
]);
|
|
30
33
|
}
|
|
31
34
|
return Buffer.from(data, "hex");
|
|
32
35
|
}
|
|
@@ -49,11 +52,15 @@ export function sleep(milliSeconds) {
|
|
|
49
52
|
export function getTransactionSize(transaction, feePayer) {
|
|
50
53
|
const clonedTransaction = new Transaction({
|
|
51
54
|
lastValidBlockHeight: 1234,
|
|
52
|
-
feePayer: (transaction === null || transaction === void 0 ? void 0 : transaction.feePayer) ||
|
|
55
|
+
feePayer: (transaction === null || transaction === void 0 ? void 0 : transaction.feePayer) ||
|
|
56
|
+
feePayer ||
|
|
57
|
+
transaction.instructions[0].programId,
|
|
53
58
|
blockhash: "CSymwgTNX1j3E4qhKfJAUE41nBWEwXufoYryPbkde5RR", // fake blockhash
|
|
54
59
|
}).add(transaction);
|
|
55
60
|
const serializedMessage = clonedTransaction.serializeMessage();
|
|
56
|
-
const uniqueSigners = new Set(clonedTransaction.instructions.flatMap((ix) => ix.keys
|
|
61
|
+
const uniqueSigners = new Set(clonedTransaction.instructions.flatMap((ix) => ix.keys
|
|
62
|
+
.filter((meta) => meta.isSigner)
|
|
63
|
+
.map((meta) => meta.pubkey.toBase58())));
|
|
57
64
|
// message length + signatures length (1 byte) + signatures count * signature size (64)
|
|
58
65
|
return serializedMessage.length + uniqueSigners.size * 64 + 1;
|
|
59
66
|
}
|
|
@@ -80,7 +87,9 @@ export class Wallet {
|
|
|
80
87
|
return __awaiter(this, void 0, void 0, function* () {
|
|
81
88
|
const promises = [];
|
|
82
89
|
for (const [id, tx] of txs.entries()) {
|
|
83
|
-
promises.push(this.signTransaction(tx, additionalSigners && additionalSigners.length > id
|
|
90
|
+
promises.push(this.signTransaction(tx, additionalSigners && additionalSigners.length > id
|
|
91
|
+
? additionalSigners[id]
|
|
92
|
+
: []));
|
|
84
93
|
}
|
|
85
94
|
return Promise.all(promises);
|
|
86
95
|
});
|
|
@@ -89,7 +98,9 @@ export class Wallet {
|
|
|
89
98
|
function sendWithRetries(connection, serialized, lastValidBlockHeight, timesToSend = 5, blockhashCommitment = "finalized") {
|
|
90
99
|
return __awaiter(this, void 0, void 0, function* () {
|
|
91
100
|
const txId = yield connection.sendRawTransaction(serialized, {
|
|
92
|
-
skipPreflight: false,
|
|
101
|
+
skipPreflight: false,
|
|
102
|
+
preflightCommitment: blockhashCommitment,
|
|
103
|
+
maxRetries: 3,
|
|
93
104
|
});
|
|
94
105
|
let blockheight = yield connection.getBlockHeight();
|
|
95
106
|
let sent = 1;
|
|
@@ -97,7 +108,7 @@ function sendWithRetries(connection, serialized, lastValidBlockHeight, timesToSe
|
|
|
97
108
|
yield connection.sendRawTransaction(serialized, {
|
|
98
109
|
skipPreflight: true,
|
|
99
110
|
preflightCommitment: blockhashCommitment,
|
|
100
|
-
maxRetries:
|
|
111
|
+
maxRetries: 5,
|
|
101
112
|
});
|
|
102
113
|
yield sleep(300);
|
|
103
114
|
blockheight = yield connection.getBlockHeight();
|
|
@@ -127,6 +138,44 @@ function setBlockhash(transaction, blockhash) {
|
|
|
127
138
|
transaction.recentBlockhash = blockhash;
|
|
128
139
|
}
|
|
129
140
|
}
|
|
141
|
+
function simulateTx(connection, tx, commitment, feePayer, convertToV0, alreadySigned) {
|
|
142
|
+
var _a;
|
|
143
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
144
|
+
let convert = convertToV0 && !alreadySigned;
|
|
145
|
+
let txCopy = isVersionedTx(tx)
|
|
146
|
+
? new VersionedTransaction(tx.message, tx.signatures)
|
|
147
|
+
: new Transaction(tx);
|
|
148
|
+
if (convert) {
|
|
149
|
+
if (isVersionedTx(txCopy)) {
|
|
150
|
+
txCopy.message.recentBlockhash = FAKE_BLOCKHASH;
|
|
151
|
+
txCopy = tx;
|
|
152
|
+
}
|
|
153
|
+
else {
|
|
154
|
+
txCopy = new VersionedTransaction(MessageV0.compile({
|
|
155
|
+
addressLookupTableAccounts: [],
|
|
156
|
+
instructions: txCopy.instructions,
|
|
157
|
+
recentBlockhash: FAKE_BLOCKHASH,
|
|
158
|
+
payerKey: feePayer,
|
|
159
|
+
}));
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
let result;
|
|
163
|
+
if (isVersionedTx(txCopy)) {
|
|
164
|
+
result = yield connection.simulateTransaction(txCopy, {
|
|
165
|
+
commitment,
|
|
166
|
+
sigVerify: alreadySigned,
|
|
167
|
+
replaceRecentBlockhash: !alreadySigned,
|
|
168
|
+
});
|
|
169
|
+
}
|
|
170
|
+
else {
|
|
171
|
+
txCopy.recentBlockhash = FAKE_BLOCKHASH;
|
|
172
|
+
result = yield connection.simulateTransaction(txCopy.compileMessage());
|
|
173
|
+
}
|
|
174
|
+
if (result.value.err !== null) {
|
|
175
|
+
throw new Error(`Tx simulation Error! Transaction message dump: ${Buffer.from(txCopy.serialize()).toString("base64")}\n Error: ${JSON.stringify(result.value.err)}, logs:\n ${(_a = result.value.logs) === null || _a === void 0 ? void 0 : _a.join("\n")}`);
|
|
176
|
+
}
|
|
177
|
+
});
|
|
178
|
+
}
|
|
130
179
|
/**
|
|
131
180
|
*
|
|
132
181
|
* @param connection rpc connection
|
|
@@ -136,11 +185,13 @@ function setBlockhash(transaction, blockhash) {
|
|
|
136
185
|
* @returns
|
|
137
186
|
*/
|
|
138
187
|
export function sendAll(connection, wallet, transactions, options) {
|
|
139
|
-
var _a, _b
|
|
188
|
+
var _a, _b;
|
|
140
189
|
return __awaiter(this, void 0, void 0, function* () {
|
|
141
|
-
const
|
|
190
|
+
const skipSign = (options === null || options === void 0 ? void 0 : options.skipSign) === undefined ? false : options.skipSign;
|
|
191
|
+
const blockhashCommitment = (options === null || options === void 0 ? void 0 : options.blockhashCommitment) === undefined
|
|
192
|
+
? (_a = connection.commitment) !== null && _a !== void 0 ? _a : "confirmed"
|
|
193
|
+
: options.blockhashCommitment;
|
|
142
194
|
const convertIntoTxV0 = (options === null || options === void 0 ? void 0 : options.convertIntoTxV0) === undefined ? true : options.convertIntoTxV0;
|
|
143
|
-
const debug = (options === null || options === void 0 ? void 0 : options.debug) === undefined ? false : options.debug;
|
|
144
195
|
const skipPreflight = (options === null || options === void 0 ? void 0 : options.skipPreflight) === undefined ? false : options.skipPreflight;
|
|
145
196
|
const rpcCalls = (options === null || options === void 0 ? void 0 : options.rpcCalls) === undefined ? 3 : options.rpcCalls;
|
|
146
197
|
if (!Array.isArray(transactions))
|
|
@@ -150,39 +201,17 @@ export function sendAll(connection, wallet, transactions, options) {
|
|
|
150
201
|
}
|
|
151
202
|
let txIds = [];
|
|
152
203
|
if ((options === null || options === void 0 ? void 0 : options.waitBetweenSend) === undefined || options.waitBetweenSend === 0) {
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
if (isVersionedTx(tx)) {
|
|
157
|
-
tx.message.recentBlockhash = FAKE_BLOCKHASH;
|
|
158
|
-
txV0 = tx;
|
|
159
|
-
}
|
|
160
|
-
else {
|
|
161
|
-
tx.recentBlockhash = FAKE_BLOCKHASH;
|
|
162
|
-
tx.feePayer = wallet.publicKey;
|
|
163
|
-
txV0 = new VersionedTransaction(MessageV0.compile({
|
|
164
|
-
addressLookupTableAccounts: [],
|
|
165
|
-
instructions: tx.instructions,
|
|
166
|
-
recentBlockhash: FAKE_BLOCKHASH,
|
|
167
|
-
payerKey: tx.feePayer,
|
|
168
|
-
}));
|
|
169
|
-
}
|
|
170
|
-
if (!skipPreflight) {
|
|
171
|
-
const simulationResult = yield connection.simulateTransaction(txV0, {
|
|
172
|
-
sigVerify: false,
|
|
173
|
-
replaceRecentBlockhash: true,
|
|
174
|
-
commitment: blockhashCommitment,
|
|
175
|
-
});
|
|
176
|
-
if (simulationResult.value.err !== null) {
|
|
177
|
-
throw new Error(`Tx simulation Error! Transaction message dump: ${Buffer.from(txV0.serialize()).toString("base64")}\n Error: ${JSON.stringify(simulationResult.value.err)}, logs:\n ${(_d = simulationResult.value.logs) === null || _d === void 0 ? void 0 : _d.join("\n")}`);
|
|
178
|
-
}
|
|
179
|
-
}
|
|
180
|
-
})));
|
|
204
|
+
if (!skipPreflight) {
|
|
205
|
+
yield Promise.all(transactions.map((tx) => simulateTx(connection, tx, blockhashCommitment, wallet.publicKey, convertIntoTxV0, skipSign)));
|
|
206
|
+
}
|
|
181
207
|
const { blockhash, lastValidBlockHeight } = yield connection.getLatestBlockhash({ commitment: blockhashCommitment });
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
208
|
+
let signed = transactions;
|
|
209
|
+
if (!skipSign) {
|
|
210
|
+
// set real blockhash
|
|
211
|
+
transactions.map((tx) => setBlockhash(tx, blockhash));
|
|
212
|
+
// sign after setting correct blockhashes
|
|
213
|
+
signed = yield wallet.signAllTransactions(transactions, options === null || options === void 0 ? void 0 : options.signers);
|
|
214
|
+
}
|
|
186
215
|
txIds = yield Promise.all(signed.map((signedTx) => {
|
|
187
216
|
var _a;
|
|
188
217
|
const serialized = Buffer.from(signedTx.serialize());
|
|
@@ -193,35 +222,19 @@ export function sendAll(connection, wallet, transactions, options) {
|
|
|
193
222
|
else {
|
|
194
223
|
for (let i = 0; i < transactions.length; i++) {
|
|
195
224
|
const tx = transactions[i];
|
|
196
|
-
const { blockhash, lastValidBlockHeight } = yield connection.getLatestBlockhash({
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
tx.feePayer = wallet.publicKey;
|
|
205
|
-
txV0 = new VersionedTransaction(MessageV0.compile({
|
|
206
|
-
addressLookupTableAccounts: [],
|
|
207
|
-
instructions: tx.instructions,
|
|
208
|
-
recentBlockhash: blockhash,
|
|
209
|
-
payerKey: tx.feePayer,
|
|
210
|
-
}));
|
|
211
|
-
}
|
|
212
|
-
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);
|
|
225
|
+
const { blockhash, lastValidBlockHeight } = yield connection.getLatestBlockhash({
|
|
226
|
+
commitment: blockhashCommitment,
|
|
227
|
+
});
|
|
228
|
+
const signed = skipSign
|
|
229
|
+
? tx
|
|
230
|
+
: yield wallet.signTransaction(tx, (options === null || options === void 0 ? void 0 : options.signers) && (options === null || options === void 0 ? void 0 : options.signers.length) > i
|
|
231
|
+
? options.signers[i]
|
|
232
|
+
: undefined);
|
|
213
233
|
if (!skipPreflight) {
|
|
214
|
-
|
|
215
|
-
sigVerify: false,
|
|
216
|
-
replaceRecentBlockhash: true,
|
|
217
|
-
commitment: "confirmed",
|
|
218
|
-
});
|
|
219
|
-
if (simulationResult.value.err !== null) {
|
|
220
|
-
throw new Error(`Tx simulation Error! Transaction message dump: ${Buffer.from(txV0.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")}`);
|
|
221
|
-
}
|
|
234
|
+
yield simulateTx(connection, tx, blockhashCommitment, wallet.publicKey, convertIntoTxV0, skipSign);
|
|
222
235
|
}
|
|
223
236
|
const serialized = Buffer.from(signed.serialize());
|
|
224
|
-
(
|
|
237
|
+
(_b = options === null || options === void 0 ? void 0 : options.logger) === null || _b === void 0 ? void 0 : _b.call(options, `Sending tx: ${serialized.toString("base64")}`);
|
|
225
238
|
txIds.push(yield sendWithRetries(connection, serialized, lastValidBlockHeight, rpcCalls, blockhashCommitment));
|
|
226
239
|
yield sleep(options.waitBetweenSend);
|
|
227
240
|
}
|
package/dist/esm/helpers.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/helpers.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/helpers.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/index.js
CHANGED
package/dist/esm/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,UAAU,CAAC;AACnC,OAAO,KAAK,SAAS,MAAM,aAAa,CAAC;AACzC,OAAO,KAAK,UAAU,MAAM,cAAc,CAAC;AAC3C,cAAc,YAAY,CAAC;AAC3B,OAAO,KAAK,OAAO,MAAM,WAAW,CAAC;AACrC,OAAO,KAAK,GAAG,MAAM,OAAO,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,UAAU,CAAC;AACnC,OAAO,KAAK,SAAS,MAAM,aAAa,CAAC;AACzC,OAAO,KAAK,UAAU,MAAM,cAAc,CAAC;AAC3C,cAAc,YAAY,CAAC;AAC3B,OAAO,KAAK,OAAO,MAAM,WAAW,CAAC;AACrC,OAAO,KAAK,GAAG,MAAM,OAAO,CAAC;AAC7B,OAAO,KAAK,QAAQ,MAAM,YAAY,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../src/interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../src/interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAqBhC,MAAM,UAAU,QAAQ,CAAC,GAAY;IACnC,OAAO,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,wDAAwD;AACvF,CAAC"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
export const deBridge = "DEbrdGj3HsRsAzx6uH4MKyREKxVAfBydijLUF3ygsFfh";
|
|
2
|
+
export const settings = "DeSetTwWhjZq6Pz9Kfdo1KoS5NqtsM6G8ERbX4SSCSft";
|
|
3
|
+
export const dlnSrc = "src5qyZHqTqecJV4aY6Cb6zDZLMDzrDKKezs22MPHr4";
|
|
4
|
+
export const dlnDst = "dst5MGcFPoBeREFAA5E3tU5ij8m5uVYwkzkSAbsLbNo";
|
|
5
|
+
export const dlnExecutor = "exe59FS5cojZkPJVDFDV8RnXCC7wd6yoBjsUtqH7Zai";
|
|
6
|
+
//# sourceMappingURL=programs.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"programs.js","sourceRoot":"","sources":["../../src/programs.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,QAAQ,GAAG,8CAA8C,CAAC;AACvE,MAAM,CAAC,MAAM,QAAQ,GAAG,8CAA8C,CAAC;AACvE,MAAM,CAAC,MAAM,MAAM,GAAG,6CAA6C,CAAC;AACpE,MAAM,CAAC,MAAM,MAAM,GAAG,6CAA6C,CAAC;AACpE,MAAM,CAAC,MAAM,WAAW,GAAG,6CAA6C,CAAC"}
|
package/dist/esm/solidityPack.js
CHANGED
|
@@ -4,8 +4,8 @@ import { hexToBuffer } from "./helpers";
|
|
|
4
4
|
* All functions are copied from ethers. This is optimization to reduce dependencies
|
|
5
5
|
*/
|
|
6
6
|
function concat(items) {
|
|
7
|
-
const objects = items.map(item => arrayify(item));
|
|
8
|
-
const length = objects.reduce((accum, item) =>
|
|
7
|
+
const objects = items.map((item) => arrayify(item));
|
|
8
|
+
const length = objects.reduce((accum, item) => accum + item.length, 0);
|
|
9
9
|
const result = new Uint8Array(length);
|
|
10
10
|
objects.reduce((offset, object) => {
|
|
11
11
|
result.set(object, offset);
|
|
@@ -14,7 +14,7 @@ function concat(items) {
|
|
|
14
14
|
return result;
|
|
15
15
|
}
|
|
16
16
|
function arrayify(value) {
|
|
17
|
-
if (typeof
|
|
17
|
+
if (typeof value === "number") {
|
|
18
18
|
const numValue = value;
|
|
19
19
|
const result = [];
|
|
20
20
|
while (value) {
|
|
@@ -29,7 +29,7 @@ function arrayify(value) {
|
|
|
29
29
|
if (BN.isBN(value)) {
|
|
30
30
|
value = `0x${value.toString("hex")}`;
|
|
31
31
|
}
|
|
32
|
-
if (typeof
|
|
32
|
+
if (typeof value === "string" && value.startsWith("0x")) {
|
|
33
33
|
return hexToBuffer(value);
|
|
34
34
|
}
|
|
35
35
|
if (Array.isArray(value) || ArrayBuffer.isView(value)) {
|
|
@@ -70,7 +70,6 @@ function toUtf8Bytes(str) {
|
|
|
70
70
|
}
|
|
71
71
|
return arrayify(result);
|
|
72
72
|
}
|
|
73
|
-
;
|
|
74
73
|
const zeroPad = (value, length) => {
|
|
75
74
|
const bufValue = arrayify(value);
|
|
76
75
|
if (bufValue.length > length) {
|
|
@@ -80,7 +79,7 @@ const zeroPad = (value, length) => {
|
|
|
80
79
|
result.set(bufValue, length - bufValue.length);
|
|
81
80
|
return result;
|
|
82
81
|
};
|
|
83
|
-
const isHexString = (data) => typeof
|
|
82
|
+
const isHexString = (data) => typeof data === "string" && data.startsWith("0x");
|
|
84
83
|
const _pack = (type, value, isArray) => {
|
|
85
84
|
const regexBytes = new RegExp("^bytes([0-9]+)$");
|
|
86
85
|
const regexNumber = new RegExp("^(u?int)([0-9]*)$");
|
|
@@ -97,7 +96,7 @@ const _pack = (type, value, isArray) => {
|
|
|
97
96
|
case "bytes":
|
|
98
97
|
return arrayify(value);
|
|
99
98
|
case "bool":
|
|
100
|
-
value =
|
|
99
|
+
value = value ? "0x01" : "0x00";
|
|
101
100
|
if (isArray) {
|
|
102
101
|
return zeroPad(value, 32);
|
|
103
102
|
}
|
|
@@ -107,7 +106,10 @@ const _pack = (type, value, isArray) => {
|
|
|
107
106
|
if (match) {
|
|
108
107
|
//let signed = (match[1] === "int")
|
|
109
108
|
let size = parseInt(match[2] || "256");
|
|
110
|
-
if ((match[2] && String(size) !== match[2]) ||
|
|
109
|
+
if ((match[2] && String(size) !== match[2]) ||
|
|
110
|
+
size % 8 !== 0 ||
|
|
111
|
+
size === 0 ||
|
|
112
|
+
size > 256) {
|
|
111
113
|
throw new Error("invalid number type");
|
|
112
114
|
}
|
|
113
115
|
if (isArray) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"solidityPack.js","sourceRoot":"","sources":["../../src/solidityPack.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,OAAO,CAAC;AACvB,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAExC;;GAEG;
|
|
1
|
+
{"version":3,"file":"solidityPack.js","sourceRoot":"","sources":["../../src/solidityPack.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/spl.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { __awaiter } from "tslib";
|
|
2
|
-
import { PublicKey, SystemProgram, Transaction, TransactionInstruction } from "@solana/web3.js";
|
|
2
|
+
import { PublicKey, SystemProgram, Transaction, TransactionInstruction, } from "@solana/web3.js";
|
|
3
3
|
import * as bl from "@solana/buffer-layout";
|
|
4
4
|
import * as blu from "@solana/buffer-layout-utils";
|
|
5
5
|
import BN from "bn.js";
|
|
6
6
|
import { Buffer } from "buffer";
|
|
7
|
-
import { ASSOCIATED_TOKEN_PROGRAM_ID, findAssociatedTokenAddress, TOKEN_PROGRAM_ID, WRAPPED_SOL_MINT } from "./accounts";
|
|
7
|
+
import { ASSOCIATED_TOKEN_PROGRAM_ID, findAssociatedTokenAddress, TOKEN_PROGRAM_ID, WRAPPED_SOL_MINT, } from "./accounts";
|
|
8
8
|
import { getAccountInfo } from "./helpers";
|
|
9
9
|
var AccountState;
|
|
10
10
|
(function (AccountState) {
|
|
@@ -13,17 +13,17 @@ var AccountState;
|
|
|
13
13
|
AccountState[AccountState["Frozen"] = 2] = "Frozen";
|
|
14
14
|
})(AccountState || (AccountState = {}));
|
|
15
15
|
const AccountLayout = bl.struct([
|
|
16
|
-
blu.publicKey(
|
|
17
|
-
blu.publicKey(
|
|
18
|
-
blu.u64(
|
|
19
|
-
bl.u32(
|
|
20
|
-
blu.publicKey(
|
|
21
|
-
bl.u8(
|
|
22
|
-
bl.u32(
|
|
23
|
-
blu.u64(
|
|
24
|
-
blu.u64(
|
|
25
|
-
bl.u32(
|
|
26
|
-
blu.publicKey(
|
|
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
27
|
]);
|
|
28
28
|
export var AccountType;
|
|
29
29
|
(function (AccountType) {
|
|
@@ -42,7 +42,11 @@ export var AccountType;
|
|
|
42
42
|
export function getTokenInfo(connection, tokenAddress) {
|
|
43
43
|
return __awaiter(this, void 0, void 0, function* () {
|
|
44
44
|
const tokenMetaProgramId = new PublicKey("metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s");
|
|
45
|
-
const findMetaplexMetadataPda = (tokenMint) => PublicKey.findProgramAddressSync([
|
|
45
|
+
const findMetaplexMetadataPda = (tokenMint) => PublicKey.findProgramAddressSync([
|
|
46
|
+
Buffer.from("metadata", "utf-8"),
|
|
47
|
+
tokenMetaProgramId.toBuffer(),
|
|
48
|
+
tokenMint.toBuffer(),
|
|
49
|
+
], tokenMetaProgramId)[0];
|
|
46
50
|
const decodeMetaplexMetadataPartial = (data) => {
|
|
47
51
|
const rawName = data.subarray(65 + 4, 65 + 36); // omit first 4 bytes, size is already hardcoded
|
|
48
52
|
const rawSymbol = data.subarray(101 + 4, 115); // omit first 4 bytes, size is already hardcoded
|
|
@@ -54,8 +58,13 @@ export function getTokenInfo(connection, tokenAddress) {
|
|
|
54
58
|
};
|
|
55
59
|
};
|
|
56
60
|
const pda = findMetaplexMetadataPda(tokenAddress);
|
|
57
|
-
const [tokenAccount, pdaAccount] = yield connection.getMultipleAccountsInfo([
|
|
58
|
-
|
|
61
|
+
const [tokenAccount, pdaAccount] = yield connection.getMultipleAccountsInfo([
|
|
62
|
+
tokenAddress,
|
|
63
|
+
pda,
|
|
64
|
+
]);
|
|
65
|
+
if (tokenAccount === null ||
|
|
66
|
+
pdaAccount === null ||
|
|
67
|
+
(pdaAccount === null || pdaAccount === void 0 ? void 0 : pdaAccount.lamports) === 0) {
|
|
59
68
|
return null;
|
|
60
69
|
}
|
|
61
70
|
// parse token account
|
|
@@ -152,7 +161,9 @@ export function getAccountWithType(connection, account) {
|
|
|
152
161
|
if (!accountData)
|
|
153
162
|
return [null, AccountType.NotExists];
|
|
154
163
|
if (accountData.owner.equals(TOKEN_PROGRAM_ID)) {
|
|
155
|
-
return isWalletCorrectATA(account, accountData.data)
|
|
164
|
+
return isWalletCorrectATA(account, accountData.data)
|
|
165
|
+
? [accountData, AccountType.CorrectATA]
|
|
166
|
+
: [accountData, AccountType.Token];
|
|
156
167
|
}
|
|
157
168
|
if (accountData.owner.equals(SystemProgram.programId))
|
|
158
169
|
return [accountData, AccountType.System];
|
|
@@ -253,7 +264,11 @@ export function buildReplenishWsolBalanceTransaction(amount, transferFrom, trans
|
|
|
253
264
|
transferFrom = new PublicKey(transferFrom);
|
|
254
265
|
transferTo = new PublicKey(transferTo);
|
|
255
266
|
const tx = new Transaction();
|
|
256
|
-
tx.add(SystemProgram.transfer({
|
|
267
|
+
tx.add(SystemProgram.transfer({
|
|
268
|
+
fromPubkey: transferFrom,
|
|
269
|
+
toPubkey: transferTo,
|
|
270
|
+
lamports: new BN(amount).toNumber(),
|
|
271
|
+
}));
|
|
257
272
|
tx.add(
|
|
258
273
|
// sync native
|
|
259
274
|
new TransactionInstruction({
|
package/dist/esm/spl.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spl.js","sourceRoot":"","sources":["../../src/spl.ts"],"names":[],"mappings":";AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"spl.js","sourceRoot":"","sources":["../../src/spl.ts"],"names":[],"mappings":"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"}
|
package/dist/types/accounts.d.ts
CHANGED
|
@@ -53,7 +53,7 @@ export declare const DeBridgeResolver: (programId: SolanaPubkey, settingsProgram
|
|
|
53
53
|
getNoDiscountAddress: (SETTINGS_PROGRAM_ID: PublicKey) => [PublicKey, number];
|
|
54
54
|
getNoBridgeFeeAddress: (SETTINGS_PROGRAM_ID: PublicKey) => [PublicKey, number];
|
|
55
55
|
}>>;
|
|
56
|
-
export declare const
|
|
56
|
+
export declare const dlnSrcResolver: (programId: SolanaPubkey) => Resolver<{
|
|
57
57
|
getStateAccount: (PMM_SRC_PROGRAM_ID: PublicKey) => [PublicKey, number];
|
|
58
58
|
getNonceAccount: (maker: PublicKey | Buffer, PMM_SRC_PROGRAM_ID: PublicKey) => [PublicKey, number];
|
|
59
59
|
getGiveOrderStateAccount: (orderId: Buffer, PMM_SRC_PROGRAM_ID: PublicKey) => [PublicKey, number];
|
|
@@ -62,7 +62,7 @@ export declare const PmmSrcResolver: (programId: SolanaPubkey) => Resolver<{
|
|
|
62
62
|
getFeeLedgerWalletAddress: (tokenMint: PublicKey, PMM_SRC_PROGRAM_ID: PublicKey) => [PublicKey, number];
|
|
63
63
|
getFeeLedgerAddress: (PMM_SRC_PROGRAM_ID: PublicKey) => [PublicKey, number];
|
|
64
64
|
}>;
|
|
65
|
-
export declare const
|
|
65
|
+
export declare const dlnDstResolver: (programId: SolanaPubkey) => Resolver<{
|
|
66
66
|
getAuthorizedSrcContractAddress: (chainId: Buffer, PMM_DST_PROGRAM_ID: PublicKey) => [PublicKey, number];
|
|
67
67
|
getAuthorizedDstNativeSenderAddress: (PMM_DST_PROGRAM_ID: PublicKey) => [PublicKey, number];
|
|
68
68
|
getTakeOrderStateAddress: (orderId: Buffer, PMM_DST_PROGRAM_ID: PublicKey) => [PublicKey, number];
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"accounts.d.ts","sourceRoot":"","sources":["../../src/accounts.ts"],"names":[],"mappings":"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"}
|