@ledgerhq/revault-sdk 0.26.2 → 0.26.3

package/lib/bake.js

@@ -97,7 +97,12 @@ async function createAndApproveRequest(input, approvers, logger) {
 	const creator = approvers[0];
 	invariant(creator, "Need at least 1 user to create a request");
 	logSubStep(`Creating request of type ${input.type}...`);
-	return approveRequest(await creator.client.requests.create.mutate({ request: input }), approvers, logger);
+	let request = await creator.client.requests.create.mutate({
+		request: input,
+		waitForChallenges: false
+	});
+	request = await waitForRequestInflightDone(creator.client, request, logger);
+	return approveRequest(request, approvers, logger);
 }
 function stripUndefinedDeep(obj) {
 	if (Array.isArray(obj)) return obj.map(stripUndefinedDeep);
@@ -488,10 +493,14 @@ async function bakeWorkspace(options, logger) {
 		logSubStep("Completing registration...");
 		registration = await userEngine.register(registration);
 		logSubStep("Creating request...");
-		let req = await admin1.client.requests.create.mutate({ request: {
-			type: "CREATE_PSD_USER",
-			data: { registrationId: registration.id }
-		} });
+		let req = await admin1.client.requests.create.mutate({
+			request: {
+				type: "CREATE_PSD_USER",
+				data: { registrationId: registration.id }
+			},
+			waitForChallenges: false
+		});
+		req = await waitForRequestInflightDone(admin1.client, req, logger);
 		req = await approveRequest(req, [admin1, admin2], logger);
 		logSubStep(`${name} has been created`);
 		const createdUser = await admin1.client.users.findById.query({ id: req.targetId });
@@ -509,15 +518,19 @@ async function bakeWorkspace(options, logger) {
 		}
 		logStep(`Creating API user "${apiUser.name}"...`);
 		logSubStep("Creating request...");
-		let req = await admin1.client.requests.create.mutate({ request: {
-			type: "CREATE_API_USER",
-			data: {
-				name: apiUser.name,
-				role: apiUser.role,
-				pubKey,
-				viewAll: apiUser.viewAll
-			}
-		} });
+		let req = await admin1.client.requests.create.mutate({
+			request: {
+				type: "CREATE_API_USER",
+				data: {
+					name: apiUser.name,
+					role: apiUser.role,
+					pubKey,
+					viewAll: apiUser.viewAll
+				}
+			},
+			waitForChallenges: false
+		});
+		req = await waitForRequestInflightDone(admin1.client, req, logger);
 		req = await approveRequest(req, [admin1, admin2], logger);
 		logSubStep(`API user "${apiUser.name}" has been created`);
 		logSubStep("Generating credentials...");
@@ -555,10 +568,14 @@ async function bakeWorkspace(options, logger) {
 		}
 		logStep(`Creating group ${group.name}...`);
 		logSubStep("Creating request...");
-		let request = await admin1.client.requests.create.mutate({ request: {
-			type: "CREATE_GROUP",
-			data: groupData
-		} });
+		let request = await admin1.client.requests.create.mutate({
+			request: {
+				type: "CREATE_GROUP",
+				data: groupData
+			},
+			waitForChallenges: false
+		});
+		request = await waitForRequestInflightDone(admin1.client, request, logger);
 		request = await approveRequest(request, [admin1, admin2], logger);
 		logSubStep(`${group.name} has been created`);
 		const createdGroup = await admin1.client.groups.findById.query({ id: request.targetId });
@@ -593,13 +610,17 @@ async function bakeWorkspace(options, logger) {
 		}
 		logStep(`Creating policy ${policy.name}...`);
 		logSubStep("Creating request...");
-		let request = await admin1.client.requests.create.mutate({ request: {
-			type: "CREATE_POLICY",
-			data: {
-				...policyEditData,
-				currency: policy.currency
-			}
-		} });
+		let request = await admin1.client.requests.create.mutate({
+			request: {
+				type: "CREATE_POLICY",
+				data: {
+					...policyEditData,
+					currency: policy.currency
+				}
+			},
+			waitForChallenges: false
+		});
+		request = await waitForRequestInflightDone(admin1.client, request, logger);
 		request = await approveRequest(request, [admin1, admin2], logger);
 		logSubStep(`${policy.name} has been created`);
 		const createdPolicy = await admin1.client.policies.findById.query({ id: request.targetId });
@@ -672,10 +693,15 @@ async function bakeWorkspace(options, logger) {
 					arbitration: arbitration.map(tradelinkReviewStepFromManifest)
 				};
 				logSubStep("Creating request...");
-				await approveRequest(await admin1.client.requests.create.mutate({ request: {
-					type: "TRADELINK_CREATE_CUSTODIAN",
-					data
-				} }), [admin1, admin2], logger);
+				let request = await admin1.client.requests.create.mutate({
+					request: {
+						type: "TRADELINK_CREATE_CUSTODIAN",
+						data
+					},
+					waitForChallenges: false
+				});
+				request = await waitForRequestInflightDone(admin1.client, request, logger);
+				await approveRequest(request, [admin1, admin2], logger);
 				logSubStep("Tradelink custodian config has been created");
 				existingTradelinkNetwork = await admin1.client.tradelink.getNetwork.query();
 			} else logger.info("[SKIPPED] Custodian config already exists");
@@ -701,17 +727,23 @@ async function bakeWorkspace(options, logger) {
 				continue;
 			}
 			logSubStep("Creating request...");
-			await approveRequest(await admin1.client.requests.create.mutate({ request: {
-				type: "TRADELINK_CREATE_EXCHANGE",
-				data: {
-					tradelinkId: exchangeId,
-					groups: exchange.groups.map(tradelinkReviewStepFromManifest),
-					whitelist: exchange.whitelist
-				}
-			} }), [
+			let request = await admin1.client.requests.create.mutate({
+				request: {
+					type: "TRADELINK_CREATE_EXCHANGE",
+					data: {
+						tradelinkId: exchangeId,
+						groups: exchange.groups.map(tradelinkReviewStepFromManifest),
+						whitelist: exchange.whitelist
+					}
+				},
+				waitForChallenges: false
+			});
+			request = await waitForRequestInflightDone(admin1.client, request, logger);
+			const loggedExchangeOperators = await Promise.all(exchange.groups.flatMap(({ quorum, members }) => members.slice(0, quorum).map((deviceIndex) => workspaceEngine.withDeviceIndex(deviceIndex).login())));
+			await approveRequest(request, [
 				admin1,
 				admin2,
-				...await Promise.all(exchange.groups.flatMap(({ quorum, members }) => members.slice(0, quorum).map((deviceIndex) => workspaceEngine.withDeviceIndex(deviceIndex).login())))
+				...loggedExchangeOperators
 			], logger);
 			existingTradelinkNetwork = await admin1.client.tradelink.getNetwork.query();
 			invariant(existingTradelinkNetwork !== null, "Tradelink network exists");
@@ -730,17 +762,23 @@ async function bakeWorkspace(options, logger) {
 				continue;
 			}
 			logSubStep("Creating request...");
-			await approveRequest(await admin1.client.requests.create.mutate({ request: {
-				type: "TRADELINK_CREATE_ASSET_MANAGER",
-				data: {
-					tradelinkId: assetManagerId,
-					groups: assetManager.groups.map(tradelinkReviewStepFromManifest),
-					whitelist: assetManager.whitelist
-				}
-			} }), [
+			let request = await admin1.client.requests.create.mutate({
+				request: {
+					type: "TRADELINK_CREATE_ASSET_MANAGER",
+					data: {
+						tradelinkId: assetManagerId,
+						groups: assetManager.groups.map(tradelinkReviewStepFromManifest),
+						whitelist: assetManager.whitelist
+					}
+				},
+				waitForChallenges: false
+			});
+			request = await waitForRequestInflightDone(admin1.client, request, logger);
+			const loggedAssetManagerOperators = await Promise.all(assetManager.groups.flatMap(({ quorum, members }) => members.slice(0, quorum).map((deviceIndex) => workspaceEngine.withDeviceIndex(deviceIndex).login())));
+			await approveRequest(request, [
 				admin1,
 				admin2,
-				...await Promise.all(assetManager.groups.flatMap(({ quorum, members }) => members.slice(0, quorum).map((deviceIndex) => workspaceEngine.withDeviceIndex(deviceIndex).login())))
+				...loggedAssetManagerOperators
 			], logger);
 			existingTradelinkNetwork = await admin1.client.tradelink.getNetwork.query();
 			invariant(existingTradelinkNetwork !== null, "Tradelink network exists");
@@ -986,7 +1024,7 @@ async function recipeWorkspace(options, logger) {
 			"EXECUTE_CONTRACT",
 			"SIGN_MESSAGE",
 			"RECEIVE"
-		].includes(value), "Unexpected governance rule type: " + value);
+		].includes(value), `Unexpected governance rule type: ${value}`);
 		return value;
 	}
 	function govRuleToManifest(rule) {
@@ -1258,6 +1296,6 @@ async function bakeManifest(options, logger) {
 	logger.info("Successfully baked");
 }
 //#endregion
-export { bakeManifest, bakePledgeAdjustment, createAndApproveRequest, recipeManifest, zManifest, zManifestPolicy };
+export { bakeManifest, bakePledgeAdjustment, createAndApproveRequest, recipeManifest, waitForRequestInflightDone, zManifest, zManifestPolicy };
 
 //# sourceMappingURL=bake.js.map