@xyo-network/xl1-rpc 1.8.2 → 1.8.3
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/neutral/index.mjs +11 -72
- package/dist/neutral/index.mjs.map +1 -1
- package/dist/neutral/provider/provider/index.d.ts +0 -2
- package/dist/neutral/provider/provider/index.d.ts.map +1 -1
- package/dist/neutral/transport/post-message/PostMessageRpcTransport.d.ts +1 -0
- package/dist/neutral/transport/post-message/PostMessageRpcTransport.d.ts.map +1 -1
- package/dist/neutral/transport/post-message/SessionEnvelope.d.ts +1 -0
- package/dist/neutral/transport/post-message/SessionEnvelope.d.ts.map +1 -1
- package/dist/neutral/transport/post-message/helpers.d.ts +3 -0
- package/dist/neutral/transport/post-message/helpers.d.ts.map +1 -1
- package/dist/node/index-node.mjs +11 -72
- package/dist/node/index-node.mjs.map +1 -1
- package/dist/node/provider/provider/index.d.ts +0 -2
- package/dist/node/provider/provider/index.d.ts.map +1 -1
- package/dist/node/transport/post-message/PostMessageRpcTransport.d.ts +1 -0
- package/dist/node/transport/post-message/PostMessageRpcTransport.d.ts.map +1 -1
- package/dist/node/transport/post-message/SessionEnvelope.d.ts +1 -0
- package/dist/node/transport/post-message/SessionEnvelope.d.ts.map +1 -1
- package/dist/node/transport/post-message/helpers.d.ts +3 -0
- package/dist/node/transport/post-message/helpers.d.ts.map +1 -1
- package/package.json +3 -4
- package/src/provider/provider/index.ts +0 -2
- package/src/transport/post-message/PostMessageRpcTransport.ts +1 -0
- package/src/transport/post-message/SessionEnvelope.ts +1 -0
- package/src/transport/post-message/helpers.ts +3 -0
- package/dist/neutral/provider/provider/confirmSubmittedTransaction.d.ts +0 -21
- package/dist/neutral/provider/provider/confirmSubmittedTransaction.d.ts.map +0 -1
- package/dist/neutral/provider/provider/confirmTransaction.d.ts +0 -4
- package/dist/neutral/provider/provider/confirmTransaction.d.ts.map +0 -1
- package/dist/node/provider/provider/confirmSubmittedTransaction.d.ts +0 -21
- package/dist/node/provider/provider/confirmSubmittedTransaction.d.ts.map +0 -1
- package/dist/node/provider/provider/confirmTransaction.d.ts +0 -4
- package/dist/node/provider/provider/confirmTransaction.d.ts.map +0 -1
- package/src/provider/provider/confirmSubmittedTransaction.ts +0 -55
- package/src/provider/provider/confirmTransaction.ts +0 -37
package/dist/neutral/index.mjs
CHANGED
|
@@ -232,67 +232,8 @@ var MemoryXyoNetwork = class {
|
|
|
232
232
|
}
|
|
233
233
|
};
|
|
234
234
|
|
|
235
|
-
// src/provider/provider/confirmSubmittedTransaction.ts
|
|
236
|
-
import { delay } from "@xylabs/delay";
|
|
237
|
-
import { isDefined } from "@xylabs/typeof";
|
|
238
|
-
import { PayloadBuilder } from "@xyo-network/payload-builder";
|
|
239
|
-
var DEFAULT_CONFIRMATION_ATTEMPTS = 20;
|
|
240
|
-
var DEFAULT_DELAY_BETWEEN_ATTEMPTS = 1e3;
|
|
241
|
-
var confirmSubmittedTransaction = /* @__PURE__ */ __name(async (provider, txBW, options) => {
|
|
242
|
-
const { attempts: maxAttempts = DEFAULT_CONFIRMATION_ATTEMPTS, delay: attemptDelay = DEFAULT_DELAY_BETWEEN_ATTEMPTS } = options || {};
|
|
243
|
-
const txBWHash = await PayloadBuilder.hash(txBW);
|
|
244
|
-
options?.logger?.log("\u2705 confirming transaction:", txBWHash, "\n");
|
|
245
|
-
let attempts = 0;
|
|
246
|
-
while (true) {
|
|
247
|
-
const tx = await provider.viewer?.transactionByHash(txBWHash) ?? void 0;
|
|
248
|
-
if (isDefined(tx)) {
|
|
249
|
-
options?.logger?.log("\u{1F37B} Transaction confirmed:", txBWHash, "\n");
|
|
250
|
-
return tx;
|
|
251
|
-
} else {
|
|
252
|
-
attempts++;
|
|
253
|
-
if (attempts > maxAttempts) {
|
|
254
|
-
options?.logger?.error(`\u26A0\uFE0F Transaction not confirmed after ${maxAttempts} attempts`);
|
|
255
|
-
throw new Error(`Transaction ${txBWHash} not confirmed after ${maxAttempts} attempts`);
|
|
256
|
-
} else {
|
|
257
|
-
options?.logger?.log(`\u{1F504} Transaction not confirmed yet, attempt ${attempts}. Retrying...`, "\n");
|
|
258
|
-
await delay(attemptDelay);
|
|
259
|
-
}
|
|
260
|
-
}
|
|
261
|
-
}
|
|
262
|
-
}, "confirmSubmittedTransaction");
|
|
263
|
-
|
|
264
|
-
// src/provider/provider/confirmTransaction.ts
|
|
265
|
-
import { delay as delay2 } from "@xylabs/delay";
|
|
266
|
-
import { PayloadBuilder as PayloadBuilder2 } from "@xyo-network/payload-builder";
|
|
267
|
-
var CONFIRMATION_ATTEMPTS = 20;
|
|
268
|
-
var DELAY_BETWEEN_ATTEMPTS = 1e3;
|
|
269
|
-
var confirmTransaction = /* @__PURE__ */ __name(async (provider, txBW, onConfirm, onTimeout) => {
|
|
270
|
-
const txBWHash = await PayloadBuilder2.hash(txBW);
|
|
271
|
-
console.log("\u2705 confirming transaction:", txBWHash, "\n");
|
|
272
|
-
let confirmed = false;
|
|
273
|
-
let attempts = 0;
|
|
274
|
-
while (!confirmed) {
|
|
275
|
-
const tx = await provider.viewer?.transactionByHash(txBWHash);
|
|
276
|
-
if (tx) {
|
|
277
|
-
confirmed = true;
|
|
278
|
-
console.log("\u{1F37B} Transaction confirmed:", txBWHash, "\n");
|
|
279
|
-
onConfirm?.(txBWHash);
|
|
280
|
-
} else {
|
|
281
|
-
attempts++;
|
|
282
|
-
if (attempts > CONFIRMATION_ATTEMPTS) {
|
|
283
|
-
console.error(`\u26A0\uFE0F Transaction not confirmed after ${CONFIRMATION_ATTEMPTS} attempts`);
|
|
284
|
-
onTimeout?.();
|
|
285
|
-
return;
|
|
286
|
-
} else {
|
|
287
|
-
console.log(`\u{1F504} Transaction not confirmed yet, attempt ${attempts}. Retrying...`, "\n");
|
|
288
|
-
await delay2(DELAY_BETWEEN_ATTEMPTS);
|
|
289
|
-
}
|
|
290
|
-
}
|
|
291
|
-
}
|
|
292
|
-
}, "confirmTransaction");
|
|
293
|
-
|
|
294
235
|
// src/provider/provider/HttpRpcXyoConnection.ts
|
|
295
|
-
import { isDefined as
|
|
236
|
+
import { isDefined as isDefined2 } from "@xylabs/typeof";
|
|
296
237
|
|
|
297
238
|
// src/transport/HttpRpcTransport.ts
|
|
298
239
|
import { AxiosJson } from "@xylabs/axios";
|
|
@@ -1040,7 +981,7 @@ var MemoryRpcTransport = class {
|
|
|
1040
981
|
};
|
|
1041
982
|
|
|
1042
983
|
// src/transport/post-message/PostMessageRpcTransport.ts
|
|
1043
|
-
import { isDefined
|
|
984
|
+
import { isDefined } from "@xylabs/typeof";
|
|
1044
985
|
import { v4 as v43 } from "uuid";
|
|
1045
986
|
|
|
1046
987
|
// src/transport/post-message/helpers.ts
|
|
@@ -1079,7 +1020,7 @@ var PostMessageRpcTransport = class {
|
|
|
1079
1020
|
id,
|
|
1080
1021
|
method
|
|
1081
1022
|
};
|
|
1082
|
-
body.params =
|
|
1023
|
+
body.params = isDefined(params) && isDefined(schemas[method]) ? schemas[method].params.to.parse(params) : params;
|
|
1083
1024
|
return await new Promise((resolve, reject) => {
|
|
1084
1025
|
const id2 = body.id;
|
|
1085
1026
|
const handler = /* @__PURE__ */ __name((event) => {
|
|
@@ -1116,7 +1057,7 @@ var JsonRpcXyoRunner = class {
|
|
|
1116
1057
|
|
|
1117
1058
|
// src/provider/runner/MemoryXyoRunner.ts
|
|
1118
1059
|
import { MemoryArchivist } from "@xyo-network/archivist-memory";
|
|
1119
|
-
import { PayloadBuilder
|
|
1060
|
+
import { PayloadBuilder } from "@xyo-network/payload-builder";
|
|
1120
1061
|
import { flattenHydratedTransaction } from "@xyo-network/xl1-protocol-sdk";
|
|
1121
1062
|
var MemoryXyoRunner = class {
|
|
1122
1063
|
static {
|
|
@@ -1126,7 +1067,7 @@ var MemoryXyoRunner = class {
|
|
|
1126
1067
|
async broadcastTransaction(transaction) {
|
|
1127
1068
|
const archivist = await this.getArchivist();
|
|
1128
1069
|
await archivist.insert(flattenHydratedTransaction(transaction));
|
|
1129
|
-
return await
|
|
1070
|
+
return await PayloadBuilder.hash(transaction[0]);
|
|
1130
1071
|
}
|
|
1131
1072
|
async getArchivist() {
|
|
1132
1073
|
if (!this._archivist) {
|
|
@@ -1141,7 +1082,7 @@ var MemoryXyoRunner = class {
|
|
|
1141
1082
|
// src/provider/runner/NodeXyoRunner.ts
|
|
1142
1083
|
import { assertEx as assertEx2 } from "@xylabs/assert";
|
|
1143
1084
|
import { asArchivistInstance } from "@xyo-network/archivist-model";
|
|
1144
|
-
import { PayloadBuilder as
|
|
1085
|
+
import { PayloadBuilder as PayloadBuilder2 } from "@xyo-network/payload-builder";
|
|
1145
1086
|
import { PayloadBundleSchema } from "@xyo-network/payload-model";
|
|
1146
1087
|
import { flattenHydratedTransaction as flattenHydratedTransaction2 } from "@xyo-network/xl1-protocol-sdk";
|
|
1147
1088
|
var NodeXyoRunner = class {
|
|
@@ -1158,7 +1099,7 @@ var NodeXyoRunner = class {
|
|
|
1158
1099
|
async broadcastTransaction(transaction) {
|
|
1159
1100
|
const flattened = flattenHydratedTransaction2(transaction);
|
|
1160
1101
|
const pendingArchivist = await this.getPendingArchivist();
|
|
1161
|
-
const txHash = await
|
|
1102
|
+
const txHash = await PayloadBuilder2.hash(transaction[0]);
|
|
1162
1103
|
const payloadBundle = {
|
|
1163
1104
|
schema: PayloadBundleSchema,
|
|
1164
1105
|
payloads: flattened,
|
|
@@ -1304,7 +1245,7 @@ var JsonRpcXyoViewer = class {
|
|
|
1304
1245
|
|
|
1305
1246
|
// src/provider/provider/XyoConnection.ts
|
|
1306
1247
|
import { assertEx as assertEx3 } from "@xylabs/assert";
|
|
1307
|
-
import { PayloadBuilder as
|
|
1248
|
+
import { PayloadBuilder as PayloadBuilder3 } from "@xyo-network/payload-builder";
|
|
1308
1249
|
import { isAnyPayload } from "@xyo-network/payload-model";
|
|
1309
1250
|
import { defaultTransactionFees, isDataLakeProvider } from "@xyo-network/xl1-protocol";
|
|
1310
1251
|
import { HydratedTransactionWrapper } from "@xyo-network/xl1-wrappers";
|
|
@@ -1363,8 +1304,8 @@ var XyoConnection = class {
|
|
|
1363
1304
|
if (fromResolved === void 0) throw new Error("Failed to determine from address");
|
|
1364
1305
|
const signedTransaction = assertEx3(await signer.createSignedTransaction(chainResolved, elevatedPayloads, additionalPayloads, nbfResolved, expResolved, feesResolved, fromResolved), () => "Failed to create transaction");
|
|
1365
1306
|
const hydratedTransaction = [
|
|
1366
|
-
await
|
|
1367
|
-
await
|
|
1307
|
+
await PayloadBuilder3.addStorageMeta(signedTransaction),
|
|
1308
|
+
await PayloadBuilder3.addStorageMeta(elevatedPayloads)
|
|
1368
1309
|
];
|
|
1369
1310
|
if (isDataLakeProvider(storage)) {
|
|
1370
1311
|
const wrapper = await HydratedTransactionWrapper.parse(hydratedTransaction);
|
|
@@ -1382,7 +1323,7 @@ var HttpRpcXyoConnection = class extends XyoConnection {
|
|
|
1382
1323
|
}
|
|
1383
1324
|
constructor(params) {
|
|
1384
1325
|
const { account, endpoint } = params;
|
|
1385
|
-
const signer =
|
|
1326
|
+
const signer = isDefined2(account) ? new MemoryXyoSigner(account) : void 0;
|
|
1386
1327
|
const transport = new HttpRpcTransport(endpoint, {
|
|
1387
1328
|
...XyoRunnerRpcSchemas,
|
|
1388
1329
|
...XyoViewerRpcSchemas
|
|
@@ -1433,8 +1374,6 @@ export {
|
|
|
1433
1374
|
XyoSignerRpcSchemas,
|
|
1434
1375
|
XyoViewerRpcSchemas,
|
|
1435
1376
|
buildSessionMessageRequest,
|
|
1436
|
-
confirmSubmittedTransaction,
|
|
1437
|
-
confirmTransaction,
|
|
1438
1377
|
createRequestSchema,
|
|
1439
1378
|
createResponseSchema,
|
|
1440
1379
|
getPermissionsStoreFromTransport,
|