@debridge-finance/solana-utils 2.0.0 → 2.3.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 +27 -13
- package/dist/browser/index.js.map +1 -1
- package/dist/cjs/helpers.js +25 -13
- package/dist/cjs/helpers.js.map +1 -1
- package/dist/esm/helpers.js +26 -13
- package/dist/esm/helpers.js.map +1 -1
- package/dist/types/helpers.d.ts +2 -1
- package/dist/types/helpers.d.ts.map +1 -1
- package/package.json +1 -1
package/dist/cjs/helpers.js
CHANGED
|
@@ -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");
|
|
@@ -72,16 +85,17 @@ class Wallet {
|
|
|
72
85
|
}
|
|
73
86
|
}
|
|
74
87
|
exports.Wallet = Wallet;
|
|
75
|
-
async function sendWithRetries(connection, serialized, lastValidBlockHeight) {
|
|
88
|
+
async function sendWithRetries(connection, serialized, lastValidBlockHeight, timesToSend = 5) {
|
|
76
89
|
const txId = await connection.sendRawTransaction(serialized, {
|
|
77
90
|
skipPreflight: true,
|
|
91
|
+
maxRetries: 1000,
|
|
78
92
|
});
|
|
79
93
|
let blockheight = await connection.getBlockHeight();
|
|
80
|
-
const timesToSend = 5;
|
|
81
94
|
let sent = 0;
|
|
82
95
|
while (blockheight < lastValidBlockHeight && sent < timesToSend) {
|
|
83
96
|
await connection.sendRawTransaction(serialized, {
|
|
84
97
|
skipPreflight: true,
|
|
98
|
+
maxRetries: 1000,
|
|
85
99
|
});
|
|
86
100
|
await sleep(300);
|
|
87
101
|
blockheight = await connection.getBlockHeight();
|
|
@@ -102,9 +116,9 @@ function txToV0(transaction, payer, blockhash) {
|
|
|
102
116
|
return new web3_js_1.VersionedTransaction(v0Message);
|
|
103
117
|
}
|
|
104
118
|
}
|
|
105
|
-
async function sendAll(connection, wallet, transactions, signers, waitBetweenSend, skipPreflight = false, debug = false, convertIntoTxV0 = true) {
|
|
119
|
+
async function sendAll(connection, wallet, transactions, signers, waitBetweenSend, skipPreflight = false, debug = false, convertIntoTxV0 = true, rpcCalls = 5) {
|
|
106
120
|
if (convertIntoTxV0) {
|
|
107
|
-
const fakeBlockHash = "
|
|
121
|
+
const fakeBlockHash = "1".repeat(32);
|
|
108
122
|
transactions = transactions.map((tx) => txToV0(tx, wallet.publicKey, fakeBlockHash));
|
|
109
123
|
}
|
|
110
124
|
let txIds = [];
|
|
@@ -119,13 +133,12 @@ async function sendAll(connection, wallet, transactions, signers, waitBetweenSen
|
|
|
119
133
|
else {
|
|
120
134
|
tx.recentBlockhash = blockhash;
|
|
121
135
|
tx.feePayer = wallet.publicKey;
|
|
122
|
-
|
|
123
|
-
txV0 = new web3_js_1.VersionedTransaction(new web3_js_1.MessageV0({ addressTableLookups: [], compiledInstructions: [], header: message.header, recentBlockhash: blockhash, staticAccountKeys: message.accountKeys }));
|
|
136
|
+
txV0 = new web3_js_1.VersionedTransaction(web3_js_1.MessageV0.compile({ addressLookupTableAccounts: [], instructions: tx.instructions, recentBlockhash: blockhash, payerKey: tx.feePayer }));
|
|
124
137
|
}
|
|
125
138
|
if (!skipPreflight) {
|
|
126
139
|
const simulationResult = await connection.simulateTransaction(txV0, { sigVerify: false, replaceRecentBlockhash: true, commitment: "confirmed" });
|
|
127
140
|
if (simulationResult.value.err !== null) {
|
|
128
|
-
throw new Error(`Tx simulation Error! Transaction message dump: ${buffer_1.Buffer.from(
|
|
141
|
+
throw new Error(`Tx simulation Error! Transaction message dump: ${buffer_1.Buffer.from(txV0.serialize()).toString("base64")}\n Error: ${JSON.stringify(simulationResult.value.err)}, logs:\n ${simulationResult.value.logs?.join("\n")}`);
|
|
129
142
|
}
|
|
130
143
|
}
|
|
131
144
|
}));
|
|
@@ -135,7 +148,7 @@ async function sendAll(connection, wallet, transactions, signers, waitBetweenSen
|
|
|
135
148
|
const serialized = buffer_1.Buffer.from(signedTx.serialize());
|
|
136
149
|
if (debug)
|
|
137
150
|
console.debug(serialized.toString("base64"));
|
|
138
|
-
return sendWithRetries(connection, serialized, lastValidBlockHeight);
|
|
151
|
+
return sendWithRetries(connection, serialized, lastValidBlockHeight, rpcCalls);
|
|
139
152
|
}));
|
|
140
153
|
}
|
|
141
154
|
else {
|
|
@@ -150,20 +163,19 @@ async function sendAll(connection, wallet, transactions, signers, waitBetweenSen
|
|
|
150
163
|
else {
|
|
151
164
|
tx.recentBlockhash = blockhash;
|
|
152
165
|
tx.feePayer = wallet.publicKey;
|
|
153
|
-
|
|
154
|
-
txV0 = new web3_js_1.VersionedTransaction(new web3_js_1.MessageV0({ addressTableLookups: [], compiledInstructions: [], header: message.header, recentBlockhash: blockhash, staticAccountKeys: message.accountKeys }));
|
|
166
|
+
txV0 = new web3_js_1.VersionedTransaction(web3_js_1.MessageV0.compile({ addressLookupTableAccounts: [], instructions: tx.instructions, recentBlockhash: blockhash, payerKey: tx.feePayer }));
|
|
155
167
|
}
|
|
156
168
|
const signed = await wallet.signTransaction(tx, signers && signers.length > i ? signers[i] : undefined);
|
|
157
169
|
if (!skipPreflight) {
|
|
158
170
|
const simulationResult = await connection.simulateTransaction(txV0, { sigVerify: false, replaceRecentBlockhash: true, commitment: "confirmed" });
|
|
159
171
|
if (simulationResult.value.err !== null) {
|
|
160
|
-
throw new Error(`Tx simulation Error! Transaction message dump: ${buffer_1.Buffer.from(
|
|
172
|
+
throw new Error(`Tx simulation Error! Transaction message dump: ${buffer_1.Buffer.from(txV0.serialize()).toString("base64")}\n Error: ${JSON.stringify(simulationResult.value.err)}, logs:\n ${simulationResult.value.logs?.join("\n")}`);
|
|
161
173
|
}
|
|
162
174
|
}
|
|
163
175
|
const serialized = buffer_1.Buffer.from(signed.serialize());
|
|
164
176
|
if (debug)
|
|
165
177
|
console.debug(serialized.toString("base64"));
|
|
166
|
-
txIds.push(await sendWithRetries(connection, serialized, lastValidBlockHeight));
|
|
178
|
+
txIds.push(await sendWithRetries(connection, serialized, lastValidBlockHeight, rpcCalls));
|
|
167
179
|
await sleep(waitBetweenSend);
|
|
168
180
|
}
|
|
169
181
|
}
|
package/dist/cjs/helpers.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/helpers.ts"],"names":[],"mappings":";;;AAAA,mCAAgC;AAChC,6CAAgL;
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/helpers.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/helpers.js
CHANGED
|
@@ -1,6 +1,20 @@
|
|
|
1
1
|
import { __awaiter } from "tslib";
|
|
2
2
|
import { Buffer } from "buffer";
|
|
3
|
-
import {
|
|
3
|
+
import { 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");
|
|
@@ -71,17 +85,18 @@ export class Wallet {
|
|
|
71
85
|
});
|
|
72
86
|
}
|
|
73
87
|
}
|
|
74
|
-
function sendWithRetries(connection, serialized, lastValidBlockHeight) {
|
|
88
|
+
function sendWithRetries(connection, serialized, lastValidBlockHeight, timesToSend = 5) {
|
|
75
89
|
return __awaiter(this, void 0, void 0, function* () {
|
|
76
90
|
const txId = yield connection.sendRawTransaction(serialized, {
|
|
77
91
|
skipPreflight: true,
|
|
92
|
+
maxRetries: 1000,
|
|
78
93
|
});
|
|
79
94
|
let blockheight = yield connection.getBlockHeight();
|
|
80
|
-
const timesToSend = 5;
|
|
81
95
|
let sent = 0;
|
|
82
96
|
while (blockheight < lastValidBlockHeight && sent < timesToSend) {
|
|
83
97
|
yield connection.sendRawTransaction(serialized, {
|
|
84
98
|
skipPreflight: true,
|
|
99
|
+
maxRetries: 1000,
|
|
85
100
|
});
|
|
86
101
|
yield sleep(300);
|
|
87
102
|
blockheight = yield connection.getBlockHeight();
|
|
@@ -103,11 +118,11 @@ function txToV0(transaction, payer, blockhash) {
|
|
|
103
118
|
return new VersionedTransaction(v0Message);
|
|
104
119
|
}
|
|
105
120
|
}
|
|
106
|
-
export function sendAll(connection, wallet, transactions, signers, waitBetweenSend, skipPreflight = false, debug = false, convertIntoTxV0 = true) {
|
|
121
|
+
export function sendAll(connection, wallet, transactions, signers, waitBetweenSend, skipPreflight = false, debug = false, convertIntoTxV0 = true, rpcCalls = 5) {
|
|
107
122
|
var _a;
|
|
108
123
|
return __awaiter(this, void 0, void 0, function* () {
|
|
109
124
|
if (convertIntoTxV0) {
|
|
110
|
-
const fakeBlockHash = "
|
|
125
|
+
const fakeBlockHash = "1".repeat(32);
|
|
111
126
|
transactions = transactions.map((tx) => txToV0(tx, wallet.publicKey, fakeBlockHash));
|
|
112
127
|
}
|
|
113
128
|
let txIds = [];
|
|
@@ -123,13 +138,12 @@ export function sendAll(connection, wallet, transactions, signers, waitBetweenSe
|
|
|
123
138
|
else {
|
|
124
139
|
tx.recentBlockhash = blockhash;
|
|
125
140
|
tx.feePayer = wallet.publicKey;
|
|
126
|
-
|
|
127
|
-
txV0 = new VersionedTransaction(new MessageV0({ addressTableLookups: [], compiledInstructions: [], header: message.header, recentBlockhash: blockhash, staticAccountKeys: message.accountKeys }));
|
|
141
|
+
txV0 = new VersionedTransaction(MessageV0.compile({ addressLookupTableAccounts: [], instructions: tx.instructions, recentBlockhash: blockhash, payerKey: tx.feePayer }));
|
|
128
142
|
}
|
|
129
143
|
if (!skipPreflight) {
|
|
130
144
|
const simulationResult = yield connection.simulateTransaction(txV0, { sigVerify: false, replaceRecentBlockhash: true, commitment: "confirmed" });
|
|
131
145
|
if (simulationResult.value.err !== null) {
|
|
132
|
-
throw new Error(`Tx simulation Error! Transaction message dump: ${Buffer.from(
|
|
146
|
+
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")}`);
|
|
133
147
|
}
|
|
134
148
|
}
|
|
135
149
|
})));
|
|
@@ -139,7 +153,7 @@ export function sendAll(connection, wallet, transactions, signers, waitBetweenSe
|
|
|
139
153
|
const serialized = Buffer.from(signedTx.serialize());
|
|
140
154
|
if (debug)
|
|
141
155
|
console.debug(serialized.toString("base64"));
|
|
142
|
-
return sendWithRetries(connection, serialized, lastValidBlockHeight);
|
|
156
|
+
return sendWithRetries(connection, serialized, lastValidBlockHeight, rpcCalls);
|
|
143
157
|
}));
|
|
144
158
|
}
|
|
145
159
|
else {
|
|
@@ -154,20 +168,19 @@ export function sendAll(connection, wallet, transactions, signers, waitBetweenSe
|
|
|
154
168
|
else {
|
|
155
169
|
tx.recentBlockhash = blockhash;
|
|
156
170
|
tx.feePayer = wallet.publicKey;
|
|
157
|
-
|
|
158
|
-
txV0 = new VersionedTransaction(new MessageV0({ addressTableLookups: [], compiledInstructions: [], header: message.header, recentBlockhash: blockhash, staticAccountKeys: message.accountKeys }));
|
|
171
|
+
txV0 = new VersionedTransaction(MessageV0.compile({ addressLookupTableAccounts: [], instructions: tx.instructions, recentBlockhash: blockhash, payerKey: tx.feePayer }));
|
|
159
172
|
}
|
|
160
173
|
const signed = yield wallet.signTransaction(tx, signers && signers.length > i ? signers[i] : undefined);
|
|
161
174
|
if (!skipPreflight) {
|
|
162
175
|
const simulationResult = yield connection.simulateTransaction(txV0, { sigVerify: false, replaceRecentBlockhash: true, commitment: "confirmed" });
|
|
163
176
|
if (simulationResult.value.err !== null) {
|
|
164
|
-
throw new Error(`Tx simulation Error! Transaction message dump: ${Buffer.from(
|
|
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 ${(_a = simulationResult.value.logs) === null || _a === void 0 ? void 0 : _a.join("\n")}`);
|
|
165
178
|
}
|
|
166
179
|
}
|
|
167
180
|
const serialized = Buffer.from(signed.serialize());
|
|
168
181
|
if (debug)
|
|
169
182
|
console.debug(serialized.toString("base64"));
|
|
170
|
-
txIds.push(yield sendWithRetries(connection, serialized, lastValidBlockHeight));
|
|
183
|
+
txIds.push(yield sendWithRetries(connection, serialized, lastValidBlockHeight, rpcCalls));
|
|
171
184
|
yield sleep(waitBetweenSend);
|
|
172
185
|
}
|
|
173
186
|
}
|
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/types/helpers.d.ts
CHANGED
|
@@ -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>;
|
|
@@ -20,6 +21,6 @@ export declare class Wallet implements interfaces.IWallet {
|
|
|
20
21
|
signTransaction<T extends Transaction | VersionedTransaction>(tx: T, additionalSigners?: Signer[]): Promise<T>;
|
|
21
22
|
signAllTransactions<T extends Transaction | VersionedTransaction>(txs: T[], additionalSigners?: (Signer[] | undefined)[]): Promise<Awaited<T>[]>;
|
|
22
23
|
}
|
|
23
|
-
export declare function sendAll(connection: Connection, wallet: interfaces.IWallet, transactions: AnyTransaction[], signers?: Keypair[][], waitBetweenSend?: number, skipPreflight?: boolean, debug?: boolean, convertIntoTxV0?: 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[]>;
|
|
24
25
|
export {};
|
|
25
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,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;
|
|
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;AAuCD,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,qBAoEpB"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
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": "2.
|
|
4
|
+
"version": "2.3.0",
|
|
5
5
|
"author": "deBridge",
|
|
6
6
|
"license": "GPL-3.0-only",
|
|
7
7
|
"homepage": "https://debridge.finance",
|