@magicblock-labs/ephemeral-rollups-kit 0.3.6 → 0.3.7
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/README.md +8 -6
- package/lib/__test__/connection.test.js +56 -3
- package/lib/__test__/connection.test.js.map +1 -1
- package/lib/connection.d.ts +4 -10
- package/lib/connection.d.ts.map +1 -1
- package/lib/connection.js +29 -23
- package/lib/connection.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -1,18 +1,20 @@
|
|
|
1
|
-
# @magicblock-labs/ephemeral-rollups-
|
|
1
|
+
# @magicblock-labs/ephemeral-rollups-kit
|
|
2
2
|
|
|
3
|
-
TypeScript helpers for preparing and routing transactions to Ephemeral Rollups on Solana.
|
|
3
|
+
TypeScript helpers for preparing and routing transactions to Ephemeral Rollups on Solana with @solana/kit.
|
|
4
4
|
|
|
5
5
|
Quickstart and integration guide:
|
|
6
|
-
https://docs.magicblock.gg
|
|
6
|
+
https://docs.magicblock.gg
|
|
7
7
|
|
|
8
8
|
## Install
|
|
9
9
|
|
|
10
|
-
npm install @magicblock-labs/ephemeral-rollups-
|
|
10
|
+
npm install @magicblock-labs/ephemeral-rollups-kit
|
|
11
|
+
|
|
11
12
|
# or
|
|
12
|
-
|
|
13
|
+
|
|
14
|
+
yarn add @magicblock-labs/ephemeral-rollups-kit
|
|
13
15
|
|
|
14
16
|
## Usage (basic)
|
|
15
17
|
|
|
16
|
-
import { MagicRouter } from "@magicblock-labs/ephemeral-rollups-
|
|
18
|
+
import { MagicRouter } from "@magicblock-labs/ephemeral-rollups-kit";
|
|
17
19
|
|
|
18
20
|
// See full examples and docs in the Quickstart link above.
|
|
@@ -98,8 +98,10 @@ vitest_1.vi.mock("@solana/kit", () => ({
|
|
|
98
98
|
partiallySignTransaction: vitest_1.vi.fn(),
|
|
99
99
|
compileTransaction: vitest_1.vi.fn(),
|
|
100
100
|
getBase64EncodedWireTransaction: vitest_1.vi.fn(),
|
|
101
|
-
|
|
101
|
+
isFullySignedTransaction: vitest_1.vi.fn(),
|
|
102
|
+
assertIsTransactionWithBlockhashLifetime: vitest_1.vi.fn(),
|
|
102
103
|
assertIsTransactionMessageWithBlockhashLifetime: vitest_1.vi.fn(),
|
|
104
|
+
pipe: vitest_1.vi.fn((tx, fn) => fn(tx)),
|
|
103
105
|
setTransactionMessageLifetimeUsingBlockhash: vitest_1.vi.fn((blockhash, tx) => tx),
|
|
104
106
|
}));
|
|
105
107
|
vitest_1.vi.mock("../utils", () => ({
|
|
@@ -136,6 +138,9 @@ vitest_1.vi.mock("@solana/transaction-confirmation", () => ({
|
|
|
136
138
|
vitest_1.vi.mocked(utils.getWritableAccounts).mockReturnValue(["account1"]);
|
|
137
139
|
vitest_1.vi.mocked(utils.parseScheduleCommitsLogsMessage).mockReturnValue(mockSignature);
|
|
138
140
|
vitest_1.vi.mocked(utils.parseCommitsLogsMessage).mockReturnValue(mockSignature);
|
|
141
|
+
vitest_1.vi.mocked(solanaKit.isFullySignedTransaction).mockImplementation(() => true);
|
|
142
|
+
vitest_1.vi.mocked(solanaKit.assertIsTransactionWithBlockhashLifetime).mockImplementation(() => { });
|
|
143
|
+
vitest_1.vi.mocked(solanaKit.assertIsTransactionMessageWithBlockhashLifetime).mockImplementation(() => { });
|
|
139
144
|
});
|
|
140
145
|
(0, vitest_1.it)("should create a Connection instance", async () => {
|
|
141
146
|
const connection = await connection_1.Connection.create("http://localhost", "ws://localhost");
|
|
@@ -163,6 +168,53 @@ vitest_1.vi.mock("@solana/transaction-confirmation", () => ({
|
|
|
163
168
|
const sig = await connection.sendTransaction(txMessage, mockSigners);
|
|
164
169
|
(0, vitest_1.expect)(sig).toBe(mockSignature);
|
|
165
170
|
});
|
|
171
|
+
(0, vitest_1.it)("sendTransaction - fully signed TransactionWithLifetime", async () => {
|
|
172
|
+
const connection = await connection_1.Connection.create("http://localhost");
|
|
173
|
+
const fullySignedTx = {
|
|
174
|
+
messageBytes: mockTxBytes,
|
|
175
|
+
signatures: {},
|
|
176
|
+
lifetimeConstraint: mockLifetimeConstraint,
|
|
177
|
+
};
|
|
178
|
+
vitest_1.vi.mocked(solanaKit.isFullySignedTransaction).mockImplementation(() => true);
|
|
179
|
+
const sig = await connection.sendTransaction(fullySignedTx, mockSigners);
|
|
180
|
+
(0, vitest_1.expect)(sig).toBe(mockSignature);
|
|
181
|
+
(0, vitest_1.expect)(solanaKit.isFullySignedTransaction).toHaveBeenCalled();
|
|
182
|
+
});
|
|
183
|
+
(0, vitest_1.it)("sendTransaction - unsigned TransactionWithLifetime", async () => {
|
|
184
|
+
const connection = await connection_1.Connection.create("http://localhost");
|
|
185
|
+
const unsignedTx = {
|
|
186
|
+
messageBytes: mockTxBytes,
|
|
187
|
+
signatures: {},
|
|
188
|
+
lifetimeConstraint: mockLifetimeConstraint,
|
|
189
|
+
};
|
|
190
|
+
vitest_1.vi.mocked(solanaKit.partiallySignTransaction).mockResolvedValue({
|
|
191
|
+
messageBytes: mockTxBytes,
|
|
192
|
+
signatures: {},
|
|
193
|
+
lifetimeConstraint: mockLifetimeConstraint,
|
|
194
|
+
});
|
|
195
|
+
const sig = await connection.sendTransaction(unsignedTx, mockSigners);
|
|
196
|
+
(0, vitest_1.expect)(sig).toBe(mockSignature);
|
|
197
|
+
(0, vitest_1.expect)(solanaKit.isFullySignedTransaction).toHaveBeenCalled();
|
|
198
|
+
});
|
|
199
|
+
(0, vitest_1.it)("sendTransaction - TransactionMessage without blockhash", async () => {
|
|
200
|
+
const connection = await connection_1.Connection.create("http://localhost");
|
|
201
|
+
const txMessage = {
|
|
202
|
+
feePayer: "payer",
|
|
203
|
+
};
|
|
204
|
+
const prepareSpy = vitest_1.vi
|
|
205
|
+
.spyOn(connection, "prepareTransactionWithLatestBlockhash")
|
|
206
|
+
.mockImplementation(async (tx) => ({
|
|
207
|
+
...tx,
|
|
208
|
+
messageBytes: mockTxBytes,
|
|
209
|
+
signatures: {},
|
|
210
|
+
lifetimeConstraint: mockLifetimeConstraint,
|
|
211
|
+
}));
|
|
212
|
+
const sig = await connection.sendTransaction(txMessage, mockSigners);
|
|
213
|
+
(0, vitest_1.expect)(sig).toBe(mockSignature);
|
|
214
|
+
(0, vitest_1.expect)(prepareSpy).toHaveBeenCalledWith(txMessage);
|
|
215
|
+
(0, vitest_1.expect)(solanaKit.compileTransaction).toHaveBeenCalled();
|
|
216
|
+
(0, vitest_1.expect)(solanaKit.partiallySignTransaction).toHaveBeenCalled();
|
|
217
|
+
});
|
|
166
218
|
(0, vitest_1.it)("should confirmTransaction without errors", async () => {
|
|
167
219
|
const connection = await connection_1.Connection.create("http://localhost");
|
|
168
220
|
await (0, vitest_1.expect)(connection.confirmTransaction(mockSignature)).resolves.not.toThrow();
|
|
@@ -171,8 +223,9 @@ vitest_1.vi.mock("@solana/transaction-confirmation", () => ({
|
|
|
171
223
|
(0, vitest_1.it)("should partiallySignTransaction", async () => {
|
|
172
224
|
const connection = await connection_1.Connection.create("http://localhost");
|
|
173
225
|
const txMessage = {
|
|
174
|
-
|
|
175
|
-
|
|
226
|
+
messageBytes: mockTxBytes,
|
|
227
|
+
signatures: {},
|
|
228
|
+
lifetimeConstraint: mockLifetimeConstraint,
|
|
176
229
|
};
|
|
177
230
|
const partiallySigned = await connection.partiallySignTransaction(mockSigners, txMessage);
|
|
178
231
|
(0, vitest_1.expect)(partiallySigned).toHaveProperty("messageBytes");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection.test.js","sourceRoot":"","sources":["../../src/__test__/connection.test.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"connection.test.js","sourceRoot":"","sources":["../../src/__test__/connection.test.ts"],"names":[],"mappings":"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"}
|
package/lib/connection.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Blockhash, Commitment, Rpc, RpcSubscriptions, Signature, SolanaRpcSubscriptionsApi, TransactionMessage, TransactionMessageWithFeePayer, SolanaRpcApi, TransactionWithBlockhashLifetime,
|
|
1
|
+
import { Blockhash, Commitment, Rpc, RpcSubscriptions, Signature, SolanaRpcSubscriptionsApi, TransactionMessage, TransactionMessageWithFeePayer, SolanaRpcApi, TransactionWithBlockhashLifetime, Transaction, TransactionWithLifetime } from "@solana/kit";
|
|
2
2
|
type LatestBlockhash = Readonly<{
|
|
3
3
|
blockhash: Blockhash;
|
|
4
4
|
lastValidBlockHeight: bigint;
|
|
@@ -16,19 +16,13 @@ export declare class Connection {
|
|
|
16
16
|
abortSignal?: AbortSignal;
|
|
17
17
|
}): Promise<void>;
|
|
18
18
|
prepareTransactionWithLatestBlockhash(transaction: TransactionMessage & TransactionMessageWithFeePayer): Promise<TransactionMessage & TransactionMessageWithFeePayer<string>>;
|
|
19
|
-
sendTransaction(transaction: (TransactionMessage & TransactionMessageWithFeePayer)
|
|
20
|
-
messageBytes: TransactionMessageBytes;
|
|
21
|
-
signatures: SignaturesMap;
|
|
22
|
-
}>, signers: CryptoKeyPair[], options?: {
|
|
19
|
+
sendTransaction(transaction: Transaction | (Transaction & TransactionWithBlockhashLifetime) | (TransactionMessage & TransactionMessageWithFeePayer), signers: CryptoKeyPair[], options?: {
|
|
23
20
|
skipPreflight?: boolean;
|
|
24
21
|
preflightCommitment?: Commitment;
|
|
25
22
|
}): Promise<Signature>;
|
|
26
|
-
partiallySignTransaction(signers: CryptoKeyPair[], transaction:
|
|
27
|
-
messageBytes: TransactionMessageBytes;
|
|
28
|
-
signatures: SignaturesMap;
|
|
29
|
-
}>>>;
|
|
23
|
+
partiallySignTransaction(signers: CryptoKeyPair[], transaction: Transaction & TransactionWithLifetime): Promise<Transaction & TransactionWithLifetime>;
|
|
30
24
|
sendAndConfirmTransaction(transaction: TransactionMessage & TransactionMessageWithFeePayer, signers: CryptoKeyPair[], config: SendAndConfirmTransactionConfig): Promise<Signature>;
|
|
31
|
-
getLatestBlockhashForTransaction(transaction: TransactionMessage): Promise<Readonly<LatestBlockhash>>;
|
|
25
|
+
getLatestBlockhashForTransaction(transaction: TransactionMessage & TransactionMessageWithFeePayer): Promise<Readonly<LatestBlockhash>>;
|
|
32
26
|
getCommitmentSignature(signature: Signature): Promise<Signature>;
|
|
33
27
|
}
|
|
34
28
|
export interface SendAndConfirmTransactionConfig {
|
package/lib/connection.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,SAAS,EACT,UAAU,EAOV,GAAG,EACH,gBAAgB,EAChB,SAAS,EACT,yBAAyB,EACzB,kBAAkB,EAClB,8BAA8B,EAE9B,YAAY,EACZ,gCAAgC,
|
|
1
|
+
{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,SAAS,EACT,UAAU,EAOV,GAAG,EACH,gBAAgB,EAChB,SAAS,EACT,yBAAyB,EACzB,kBAAkB,EAClB,8BAA8B,EAE9B,YAAY,EACZ,gCAAgC,EAEhC,WAAW,EACX,uBAAuB,EAExB,MAAM,aAAa,CAAC;AAerB,KAAK,eAAe,GAAG,QAAQ,CAAC;IAC9B,SAAS,EAAE,SAAS,CAAC;IACrB,oBAAoB,EAAE,MAAM,CAAC;CAC9B,CAAC,CAAC;AAUH,qBAAa,UAAU;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,GAAG,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC;IACvB,gBAAgB,EAAE,gBAAgB,CAAC,yBAAyB,CAAC,CAAC;IAC9D,aAAa,EAAE,OAAO,CAAC;IAEvB,OAAO;WAwBa,MAAM,CACxB,cAAc,EAAE,MAAM,EACtB,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,UAAU,CAAC;IAuBT,kBAAkB,CAC7B,SAAS,EAAE,SAAS,EACpB,OAAO,CAAC,EAAE;QACR,UAAU,CAAC,EAAE,UAAU,CAAC;QACxB,WAAW,CAAC,EAAE,WAAW,CAAC;KAC3B,GACA,OAAO,CAAC,IAAI,CAAC;IA4CH,qCAAqC,CAChD,WAAW,EAAE,kBAAkB,GAAG,8BAA8B;IAwBrD,eAAe,CAC1B,WAAW,EACP,WAAW,GACX,CAAC,WAAW,GAAG,gCAAgC,CAAC,GAChD,CAAC,kBAAkB,GAAG,8BAA8B,CAAC,EACzD,OAAO,EAAE,aAAa,EAAE,EACxB,OAAO,CAAC,EAAE;QAAE,aAAa,CAAC,EAAE,OAAO,CAAC;QAAC,mBAAmB,CAAC,EAAE,UAAU,CAAA;KAAE,GACtE,OAAO,CAAC,SAAS,CAAC;IAwFR,wBAAwB,CACnC,OAAO,EAAE,aAAa,EAAE,EACxB,WAAW,EAAE,WAAW,GAAG,uBAAuB,GACjD,OAAO,CAAC,WAAW,GAAG,uBAAuB,CAAC;IAiBpC,yBAAyB,CACpC,WAAW,EAAE,kBAAkB,GAAG,8BAA8B,EAChE,OAAO,EAAE,aAAa,EAAE,EACxB,MAAM,EAAE,+BAA+B,GACtC,OAAO,CAAC,SAAS,CAAC;IAaR,gCAAgC,CAC3C,WAAW,EAAE,kBAAkB,GAAG,8BAA8B,GAC/D,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;IAsDxB,sBAAsB,CACjC,SAAS,EAAE,SAAS,GACnB,OAAO,CAAC,SAAS,CAAC;CAsCtB;AAED,MAAM,WAAW,+BAA+B;IAE9C,UAAU,CAAC,EAAE,UAAU,CAAC;IAExB,WAAW,CAAC,EAAE,WAAW,CAAC;IAE1B,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB,mBAAmB,CAAC,EAAE,UAAU,CAAC;IAEjC,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB"}
|
package/lib/connection.js
CHANGED
|
@@ -53,40 +53,46 @@ class Connection {
|
|
|
53
53
|
"blockhash" in transaction.lifetimeConstraint &&
|
|
54
54
|
transaction.lifetimeConstraint.blockhash !==
|
|
55
55
|
undefined;
|
|
56
|
-
|
|
57
|
-
const
|
|
58
|
-
|
|
59
|
-
.sendTransaction(
|
|
56
|
+
const serializeAndSendTransaction = async (tx) => {
|
|
57
|
+
const serialized = (0, kit_1.getBase64EncodedWireTransaction)(tx);
|
|
58
|
+
return this.rpc
|
|
59
|
+
.sendTransaction(serialized, {
|
|
60
60
|
encoding: "base64",
|
|
61
61
|
skipPreflight,
|
|
62
62
|
preflightCommitment,
|
|
63
63
|
...options,
|
|
64
64
|
})
|
|
65
65
|
.send();
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
66
|
+
};
|
|
67
|
+
if ("signatures" in transaction && "messageBytes" in transaction) {
|
|
68
|
+
const fullySigned = (() => {
|
|
69
|
+
try {
|
|
70
|
+
(0, kit_1.isFullySignedTransaction)(transaction);
|
|
71
|
+
return true;
|
|
72
|
+
}
|
|
73
|
+
catch {
|
|
74
|
+
return false;
|
|
75
|
+
}
|
|
76
|
+
})();
|
|
77
|
+
if (fullySigned) {
|
|
78
|
+
return serializeAndSendTransaction(transaction);
|
|
72
79
|
}
|
|
80
|
+
(0, kit_1.assertIsTransactionWithBlockhashLifetime)(transaction);
|
|
73
81
|
const signedTransaction = await this.partiallySignTransaction(signers, transaction);
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
.sendTransaction(serializedTransaction, {
|
|
77
|
-
encoding: "base64",
|
|
78
|
-
skipPreflight,
|
|
79
|
-
preflightCommitment,
|
|
80
|
-
...options,
|
|
81
|
-
})
|
|
82
|
-
.send();
|
|
83
|
-
return signature;
|
|
82
|
+
(0, kit_1.isFullySignedTransaction)(signedTransaction);
|
|
83
|
+
return serializeAndSendTransaction(signedTransaction);
|
|
84
84
|
}
|
|
85
|
+
if (!hasBlockhash) {
|
|
86
|
+
transaction =
|
|
87
|
+
await this.prepareTransactionWithLatestBlockhash(transaction);
|
|
88
|
+
}
|
|
89
|
+
(0, kit_1.assertIsTransactionMessageWithBlockhashLifetime)(transaction);
|
|
90
|
+
const compiled = (0, kit_1.compileTransaction)(transaction);
|
|
91
|
+
const signedTransaction = await this.partiallySignTransaction(signers, compiled);
|
|
92
|
+
return serializeAndSendTransaction(signedTransaction);
|
|
85
93
|
}
|
|
86
94
|
async partiallySignTransaction(signers, transaction) {
|
|
87
|
-
(0, kit_1.
|
|
88
|
-
const compiledTransaction = (0, kit_1.compileTransaction)(transaction);
|
|
89
|
-
const signedTransaction = await (0, kit_1.partiallySignTransaction)(signers, compiledTransaction);
|
|
95
|
+
const signedTransaction = await (0, kit_1.partiallySignTransaction)(signers, transaction);
|
|
90
96
|
return signedTransaction;
|
|
91
97
|
}
|
|
92
98
|
async sendAndConfirmTransaction(transaction, signers, config) {
|
package/lib/connection.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":"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"}
|