@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/node/index-node.mjs
CHANGED
|
@@ -928,67 +928,8 @@ var MemoryXyoNetwork = class {
|
|
|
928
928
|
}
|
|
929
929
|
};
|
|
930
930
|
|
|
931
|
-
// src/provider/provider/confirmSubmittedTransaction.ts
|
|
932
|
-
import { delay } from "@xylabs/delay";
|
|
933
|
-
import { isDefined } from "@xylabs/typeof";
|
|
934
|
-
import { PayloadBuilder } from "@xyo-network/payload-builder";
|
|
935
|
-
var DEFAULT_CONFIRMATION_ATTEMPTS = 20;
|
|
936
|
-
var DEFAULT_DELAY_BETWEEN_ATTEMPTS = 1e3;
|
|
937
|
-
var confirmSubmittedTransaction = /* @__PURE__ */ __name(async (provider, txBW, options) => {
|
|
938
|
-
const { attempts: maxAttempts = DEFAULT_CONFIRMATION_ATTEMPTS, delay: attemptDelay = DEFAULT_DELAY_BETWEEN_ATTEMPTS } = options || {};
|
|
939
|
-
const txBWHash = await PayloadBuilder.hash(txBW);
|
|
940
|
-
options?.logger?.log("\u2705 confirming transaction:", txBWHash, "\n");
|
|
941
|
-
let attempts = 0;
|
|
942
|
-
while (true) {
|
|
943
|
-
const tx = await provider.viewer?.transactionByHash(txBWHash) ?? void 0;
|
|
944
|
-
if (isDefined(tx)) {
|
|
945
|
-
options?.logger?.log("\u{1F37B} Transaction confirmed:", txBWHash, "\n");
|
|
946
|
-
return tx;
|
|
947
|
-
} else {
|
|
948
|
-
attempts++;
|
|
949
|
-
if (attempts > maxAttempts) {
|
|
950
|
-
options?.logger?.error(`\u26A0\uFE0F Transaction not confirmed after ${maxAttempts} attempts`);
|
|
951
|
-
throw new Error(`Transaction ${txBWHash} not confirmed after ${maxAttempts} attempts`);
|
|
952
|
-
} else {
|
|
953
|
-
options?.logger?.log(`\u{1F504} Transaction not confirmed yet, attempt ${attempts}. Retrying...`, "\n");
|
|
954
|
-
await delay(attemptDelay);
|
|
955
|
-
}
|
|
956
|
-
}
|
|
957
|
-
}
|
|
958
|
-
}, "confirmSubmittedTransaction");
|
|
959
|
-
|
|
960
|
-
// src/provider/provider/confirmTransaction.ts
|
|
961
|
-
import { delay as delay2 } from "@xylabs/delay";
|
|
962
|
-
import { PayloadBuilder as PayloadBuilder2 } from "@xyo-network/payload-builder";
|
|
963
|
-
var CONFIRMATION_ATTEMPTS = 20;
|
|
964
|
-
var DELAY_BETWEEN_ATTEMPTS = 1e3;
|
|
965
|
-
var confirmTransaction = /* @__PURE__ */ __name(async (provider, txBW, onConfirm, onTimeout) => {
|
|
966
|
-
const txBWHash = await PayloadBuilder2.hash(txBW);
|
|
967
|
-
console.log("\u2705 confirming transaction:", txBWHash, "\n");
|
|
968
|
-
let confirmed = false;
|
|
969
|
-
let attempts = 0;
|
|
970
|
-
while (!confirmed) {
|
|
971
|
-
const tx = await provider.viewer?.transactionByHash(txBWHash);
|
|
972
|
-
if (tx) {
|
|
973
|
-
confirmed = true;
|
|
974
|
-
console.log("\u{1F37B} Transaction confirmed:", txBWHash, "\n");
|
|
975
|
-
onConfirm?.(txBWHash);
|
|
976
|
-
} else {
|
|
977
|
-
attempts++;
|
|
978
|
-
if (attempts > CONFIRMATION_ATTEMPTS) {
|
|
979
|
-
console.error(`\u26A0\uFE0F Transaction not confirmed after ${CONFIRMATION_ATTEMPTS} attempts`);
|
|
980
|
-
onTimeout?.();
|
|
981
|
-
return;
|
|
982
|
-
} else {
|
|
983
|
-
console.log(`\u{1F504} Transaction not confirmed yet, attempt ${attempts}. Retrying...`, "\n");
|
|
984
|
-
await delay2(DELAY_BETWEEN_ATTEMPTS);
|
|
985
|
-
}
|
|
986
|
-
}
|
|
987
|
-
}
|
|
988
|
-
}, "confirmTransaction");
|
|
989
|
-
|
|
990
931
|
// src/provider/provider/HttpRpcXyoConnection.ts
|
|
991
|
-
import { isDefined as
|
|
932
|
+
import { isDefined as isDefined2 } from "@xylabs/typeof";
|
|
992
933
|
|
|
993
934
|
// src/transport/HttpRpcTransport.ts
|
|
994
935
|
import { AxiosJson } from "@xylabs/axios";
|
|
@@ -1075,7 +1016,7 @@ var MemoryRpcTransport = class {
|
|
|
1075
1016
|
};
|
|
1076
1017
|
|
|
1077
1018
|
// src/transport/post-message/PostMessageRpcTransport.ts
|
|
1078
|
-
import { isDefined
|
|
1019
|
+
import { isDefined } from "@xylabs/typeof";
|
|
1079
1020
|
import { v4 as v43 } from "uuid";
|
|
1080
1021
|
|
|
1081
1022
|
// src/transport/post-message/helpers.ts
|
|
@@ -1114,7 +1055,7 @@ var PostMessageRpcTransport = class {
|
|
|
1114
1055
|
id,
|
|
1115
1056
|
method
|
|
1116
1057
|
};
|
|
1117
|
-
body.params =
|
|
1058
|
+
body.params = isDefined(params) && isDefined(schemas[method]) ? schemas[method].params.to.parse(params) : params;
|
|
1118
1059
|
return await new Promise((resolve, reject) => {
|
|
1119
1060
|
const id2 = body.id;
|
|
1120
1061
|
const handler = /* @__PURE__ */ __name((event) => {
|
|
@@ -1151,7 +1092,7 @@ var JsonRpcXyoRunner = class {
|
|
|
1151
1092
|
|
|
1152
1093
|
// src/provider/runner/MemoryXyoRunner.ts
|
|
1153
1094
|
import { MemoryArchivist } from "@xyo-network/archivist-memory";
|
|
1154
|
-
import { PayloadBuilder
|
|
1095
|
+
import { PayloadBuilder } from "@xyo-network/payload-builder";
|
|
1155
1096
|
import { flattenHydratedTransaction } from "@xyo-network/xl1-protocol-sdk";
|
|
1156
1097
|
var MemoryXyoRunner = class {
|
|
1157
1098
|
static {
|
|
@@ -1161,7 +1102,7 @@ var MemoryXyoRunner = class {
|
|
|
1161
1102
|
async broadcastTransaction(transaction) {
|
|
1162
1103
|
const archivist = await this.getArchivist();
|
|
1163
1104
|
await archivist.insert(flattenHydratedTransaction(transaction));
|
|
1164
|
-
return await
|
|
1105
|
+
return await PayloadBuilder.hash(transaction[0]);
|
|
1165
1106
|
}
|
|
1166
1107
|
async getArchivist() {
|
|
1167
1108
|
if (!this._archivist) {
|
|
@@ -1176,7 +1117,7 @@ var MemoryXyoRunner = class {
|
|
|
1176
1117
|
// src/provider/runner/NodeXyoRunner.ts
|
|
1177
1118
|
import { assertEx as assertEx2 } from "@xylabs/assert";
|
|
1178
1119
|
import { asArchivistInstance } from "@xyo-network/archivist-model";
|
|
1179
|
-
import { PayloadBuilder as
|
|
1120
|
+
import { PayloadBuilder as PayloadBuilder2 } from "@xyo-network/payload-builder";
|
|
1180
1121
|
import { PayloadBundleSchema } from "@xyo-network/payload-model";
|
|
1181
1122
|
import { flattenHydratedTransaction as flattenHydratedTransaction2 } from "@xyo-network/xl1-protocol-sdk";
|
|
1182
1123
|
var NodeXyoRunner = class {
|
|
@@ -1193,7 +1134,7 @@ var NodeXyoRunner = class {
|
|
|
1193
1134
|
async broadcastTransaction(transaction) {
|
|
1194
1135
|
const flattened = flattenHydratedTransaction2(transaction);
|
|
1195
1136
|
const pendingArchivist = await this.getPendingArchivist();
|
|
1196
|
-
const txHash = await
|
|
1137
|
+
const txHash = await PayloadBuilder2.hash(transaction[0]);
|
|
1197
1138
|
const payloadBundle = {
|
|
1198
1139
|
schema: PayloadBundleSchema,
|
|
1199
1140
|
payloads: flattened,
|
|
@@ -1339,7 +1280,7 @@ var JsonRpcXyoViewer = class {
|
|
|
1339
1280
|
|
|
1340
1281
|
// src/provider/provider/XyoConnection.ts
|
|
1341
1282
|
import { assertEx as assertEx3 } from "@xylabs/assert";
|
|
1342
|
-
import { PayloadBuilder as
|
|
1283
|
+
import { PayloadBuilder as PayloadBuilder3 } from "@xyo-network/payload-builder";
|
|
1343
1284
|
import { isAnyPayload } from "@xyo-network/payload-model";
|
|
1344
1285
|
import { defaultTransactionFees, isDataLakeProvider } from "@xyo-network/xl1-protocol";
|
|
1345
1286
|
import { HydratedTransactionWrapper } from "@xyo-network/xl1-wrappers";
|
|
@@ -1398,8 +1339,8 @@ var XyoConnection = class {
|
|
|
1398
1339
|
if (fromResolved === void 0) throw new Error("Failed to determine from address");
|
|
1399
1340
|
const signedTransaction = assertEx3(await signer.createSignedTransaction(chainResolved, elevatedPayloads, additionalPayloads, nbfResolved, expResolved, feesResolved, fromResolved), () => "Failed to create transaction");
|
|
1400
1341
|
const hydratedTransaction = [
|
|
1401
|
-
await
|
|
1402
|
-
await
|
|
1342
|
+
await PayloadBuilder3.addStorageMeta(signedTransaction),
|
|
1343
|
+
await PayloadBuilder3.addStorageMeta(elevatedPayloads)
|
|
1403
1344
|
];
|
|
1404
1345
|
if (isDataLakeProvider(storage)) {
|
|
1405
1346
|
const wrapper = await HydratedTransactionWrapper.parse(hydratedTransaction);
|
|
@@ -1417,7 +1358,7 @@ var HttpRpcXyoConnection = class extends XyoConnection {
|
|
|
1417
1358
|
}
|
|
1418
1359
|
constructor(params) {
|
|
1419
1360
|
const { account, endpoint } = params;
|
|
1420
|
-
const signer =
|
|
1361
|
+
const signer = isDefined2(account) ? new MemoryXyoSigner(account) : void 0;
|
|
1421
1362
|
const transport = new HttpRpcTransport(endpoint, {
|
|
1422
1363
|
...XyoRunnerRpcSchemas,
|
|
1423
1364
|
...XyoViewerRpcSchemas
|
|
@@ -1468,8 +1409,6 @@ export {
|
|
|
1468
1409
|
XyoSignerRpcSchemas,
|
|
1469
1410
|
XyoViewerRpcSchemas,
|
|
1470
1411
|
buildSessionMessageRequest,
|
|
1471
|
-
confirmSubmittedTransaction,
|
|
1472
|
-
confirmTransaction,
|
|
1473
1412
|
createRequestSchema,
|
|
1474
1413
|
createResponseSchema,
|
|
1475
1414
|
getPermissionsStoreFromTransport,
|