@gearbox-protocol/sdk 16.3.2 → 16.4.0-next.10

package/dist/cjs/onchain/validation/checkOperation.js

@@ -43,7 +43,6 @@ async function checkOperation(input, options = {}) {
 			sender
 		}, options);
 		case "OpenCreditAccount":
-		case "RWAOpenCreditAccount":
 		case "AdjustCreditAccount": return require_onchain_validation_bundles_checkCreditOperation.checkCreditOperation({
 			sdk,
 			preview,

package/dist/cjs/onchain/validation/checks/checkReservePriceLimited.js

@@ -0,0 +1,30 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_model_errors_operation_errors = require("../../../model/errors/operation-errors.js");
+require("../../../model/index.js");
+//#region src/onchain/validation/checks/checkReservePriceLimited.ts
+/**
+* Whether a failed collateral check is the reserve price feed's doing.
+*
+* A call that hands funds over is weighed at safe prices — `min` of a token's
+* two feeds, and nothing at all where governance registered no reserve feed —
+* so an account that covers its debt at the main feed can still be refused.
+* The two are worth telling apart: a position that is genuinely too small is
+* fixed by adding collateral or requesting less, while this one is a valuation
+* the account does not control, and requesting less only helps as far as
+* `withdrawable` says it does.
+*
+* Runs after `checkCollateralised` and answers only when that one refused, so
+* the caller keeps its own threshold rather than restating it here.
+*/
+function checkReservePriceLimited(args) {
+	const { healthFactor, atMainPrices, healthFactorThreshold, withdrawable } = args;
+	if (healthFactor >= healthFactorThreshold || atMainPrices < healthFactorThreshold) return [];
+	return [require_model_errors_operation_errors.reservePriceLimited({
+		healthFactor,
+		atMainPrices,
+		healthFactorThreshold,
+		withdrawable
+	})];
+}
+//#endregion
+exports.checkReservePriceLimited = checkReservePriceLimited;

package/dist/cjs/onchain/validation/checks/index.js

@@ -14,6 +14,7 @@ const require_onchain_validation_checks_checkPoolPaused = require("./checkPoolPa
 const require_onchain_validation_checks_checkPoolSunset = require("./checkPoolSunset.js");
 const require_onchain_validation_checks_checkQuotaCount = require("./checkQuotaCount.js");
 const require_onchain_validation_checks_checkQuotaLimit = require("./checkQuotaLimit.js");
+const require_onchain_validation_checks_checkReservePriceLimited = require("./checkReservePriceLimited.js");
 exports.checkBorrowLimit = require_onchain_validation_checks_checkBorrowLimit.checkBorrowLimit;
 exports.checkCollateralised = require_onchain_validation_checks_checkCollateralised.checkCollateralised;
 exports.checkCreditAccountFrozen = require_onchain_validation_checks_checkCreditAccountFrozen.checkCreditAccountFrozen;
@@ -29,3 +30,4 @@ exports.checkPoolPaused = require_onchain_validation_checks_checkPoolPaused.chec
 exports.checkPoolSunset = require_onchain_validation_checks_checkPoolSunset.checkPoolSunset;
 exports.checkQuotaCount = require_onchain_validation_checks_checkQuotaCount.checkQuotaCount;
 exports.checkQuotaLimit = require_onchain_validation_checks_checkQuotaLimit.checkQuotaLimit;
+exports.checkReservePriceLimited = require_onchain_validation_checks_checkReservePriceLimited.checkReservePriceLimited;

package/dist/cjs/onchain/validation/index.js

@@ -18,6 +18,7 @@ const require_onchain_validation_checks_checkPoolPaused = require("./checks/chec
 const require_onchain_validation_checks_checkPoolSunset = require("./checks/checkPoolSunset.js");
 const require_onchain_validation_checks_checkQuotaCount = require("./checks/checkQuotaCount.js");
 const require_onchain_validation_checks_checkQuotaLimit = require("./checks/checkQuotaLimit.js");
+const require_onchain_validation_checks_checkReservePriceLimited = require("./checks/checkReservePriceLimited.js");
 require("./checks/index.js");
 const require_onchain_validation_bundles_checkAccountQuotas = require("./bundles/checkAccountQuotas.js");
 const require_onchain_validation_bundles_checkWalletAllowance = require("./bundles/checkWalletAllowance.js");
@@ -28,6 +29,7 @@ const require_onchain_validation_bundles_checkIncreaseDebt = require("./bundles/
 const require_onchain_validation_bundles_checkIncreaseQuota = require("./bundles/checkIncreaseQuota.js");
 const require_onchain_validation_bundles_checkMarket = require("./bundles/checkMarket.js");
 const require_onchain_validation_bundles_checkObtained = require("./bundles/checkObtained.js");
+const require_onchain_validation_bundles_checkMidasAccountGreenlist = require("./bundles/checkMidasAccountGreenlist.js");
 const require_onchain_validation_bundles_checkRWAOpenRequirements = require("./bundles/checkRWAOpenRequirements.js");
 const require_onchain_validation_bundles_checkRWAOpening = require("./bundles/checkRWAOpening.js");
 const require_onchain_validation_bundles_checkCreditOperation = require("./bundles/checkCreditOperation.js");
@@ -66,6 +68,7 @@ exports.checkLiquidationFunding = require_onchain_validation_bundles_checkLiquid
 exports.checkLiquidatorEligible = require_onchain_validation_checks_checkLiquidatorEligible.checkLiquidatorEligible;
 exports.checkMarket = require_onchain_validation_bundles_checkMarket.checkMarket;
 exports.checkMarketExpired = require_onchain_validation_checks_checkMarketExpired.checkMarketExpired;
+exports.checkMidasAccountGreenlist = require_onchain_validation_bundles_checkMidasAccountGreenlist.checkMidasAccountGreenlist;
 exports.checkObtained = require_onchain_validation_bundles_checkObtained.checkObtained;
 exports.checkOperation = require_onchain_validation_checkOperation.checkOperation;
 exports.checkPoolFunding = require_onchain_validation_bundles_checkPoolFunding.checkPoolFunding;
@@ -77,6 +80,7 @@ exports.checkQuotaCount = require_onchain_validation_checks_checkQuotaCount.chec
 exports.checkQuotaLimit = require_onchain_validation_checks_checkQuotaLimit.checkQuotaLimit;
 exports.checkRWAOpenRequirements = require_onchain_validation_bundles_checkRWAOpenRequirements.checkRWAOpenRequirements;
 exports.checkRWAOpening = require_onchain_validation_bundles_checkRWAOpening.checkRWAOpening;
+exports.checkReservePriceLimited = require_onchain_validation_checks_checkReservePriceLimited.checkReservePriceLimited;
 exports.checkSimulation = require_onchain_validation_checkSimulation.checkSimulation;
 exports.checkWallet = require_onchain_validation_bundles_checkWallet.checkWallet;
 exports.checkWalletAllowance = require_onchain_validation_bundles_checkWalletAllowance.checkWalletAllowance;

package/dist/cjs/sdk/execute/ExecuteApi.js

@@ -17,6 +17,8 @@ var ExecuteApi = class {
 		switch (request.kind) {
 			case "pool": return poolTx(sdk, request);
 			case "open": return openTx(sdk, request);
+			case "openEmpty": return openEmptyTx(sdk, request);
+			case "borrow": return borrowTx(sdk, request);
 			case "account": return accountTx(sdk, request);
 		}
 	}
@@ -63,17 +65,75 @@ async function openTx(sdk, request) {
 		reopenCreditAccount: state.creditAccount,
 		permits: {},
 		referralCode: 0n,
-		rwaOptions: await openRwaOptions(sdk, request)
+		rwaOptions: await openRwaOptions(sdk, request, request.targetToken)
+	});
+}
+/**
+* The opening with nothing in it: no debt to draw, no collateral to take, no
+* path to run and no quota to buy, so `openCA` is left with the price updates
+* the market demands and the facade's own `openCreditAccount`.
+*
+* Nothing is read off the preparation because there is nothing on it. The
+* account holds no token, so an RWA market has none to gate on either.
+**/
+function openEmptyTx(sdk, request) {
+	return sdk.accounts.openCA({
+		creditManager: request.creditManager,
+		to: request.wallet,
+		collateral: [],
+		ethAmount: 0n,
+		debt: 0n,
+		calls: [],
+		averageQuota: [],
+		minQuota: [],
+		permits: {},
+		referralCode: 0n
+	});
+}
+/**
+* A loan is an opening whose debt leaves again, so it is the same `openCA`
+* with `withdrawToken` set: the facade draws the debt, takes the collateral,
+* runs whatever path buys the payout, and sweeps that payout to the wallet.
+*
+* Both quota branches are the one the state carries. An opening has two
+* because the balances it lands on are a router quote; here the account is
+* left holding the collateral the caller named, and a named amount has no
+* floor to differ from.
+**/
+async function borrowTx(sdk, request) {
+	const { creditManager, wallet, ethAmount, sim } = request;
+	const { state } = sim.data;
+	const collateral = {
+		token: state.collateral.token.address,
+		balance: state.collateral.value
+	};
+	return sdk.accounts.openCA({
+		creditManager,
+		to: wallet,
+		collateral: [collateral],
+		ethAmount,
+		debt: state.totalDebt.value,
+		calls: state.calls,
+		withdrawToken: state.borrowed.token.address,
+		averageQuota: state.quotaIncrease,
+		minQuota: state.quotaIncrease,
+		reopenCreditAccount: state.creditAccount,
+		permits: {},
+		referralCode: 0n,
+		rwaOptions: await openRwaOptions(sdk, request, collateral.token)
 	});
 }
 /**
 * The documented `openCA` contract: ask the market for its open requirements
 * and hand them back as operation args, with the caller's cached signatures
-* attached. `undefined` on non-RWA markets and when no target token is named.
+* attached. `undefined` on non-RWA markets and when no token is named.
+*
+* `token` is the one the account ends up holding, which is what an RWA market
+* gates on: the opening's target, and the borrow's collateral.
 **/
-async function openRwaOptions(sdk, request) {
-	if (!request.targetToken) return;
-	const requirements = await sdk.accounts.getOpenAccountRequirements(request.wallet, request.creditManager, { tokenOutAddress: request.targetToken });
+async function openRwaOptions(sdk, request, token) {
+	if (!token) return;
+	const requirements = await sdk.accounts.getOpenAccountRequirements(request.wallet, request.creditManager, { tokenOutAddress: token });
 	if (requirements?.protocol !== "securitize") return;
 	return {
 		protocol: "securitize",

package/dist/cjs/sdk/prepare/PrepareApi.js

@@ -196,26 +196,33 @@ var PrepareApi = class extends require_onchain_base_MultichainConstruct.Multicha
 		}
 	}
 	/**
+	* {@inheritDoc IOpportunitiesPrepare.openEmptyCreditAccount}
+	**/
+	async openEmptyCreditAccount(strategy) {
+		try {
+			const sdk = await this.#chain(strategy.chainId);
+			const at = stateBlock(sdk);
+			const result = await service(sdk).openEmptyAccountIntent({
+				sdk,
+				creditManager: strategy.creditManager
+			});
+			return result.ok ? require_model_result.sdkOk(at) : methodError(result);
+		} catch (e) {
+			return require_model_result.sdkErr(require_model_errors_prepare_errors.unexpectedFailure(e));
+		}
+	}
+	/**
 	* {@inheritDoc IOpportunitiesPrepare.openNewStrategy}
 	**/
 	async openNewStrategy(strategy, params) {
 		try {
 			const sdk = await this.#chain(strategy.chainId);
 			const at = stateBlock(sdk);
-			if (params.empty) return opened(await service(sdk).openStrategyIntent({
-				sdk,
-				creditManager: strategy.creditManager,
-				empty: true
-			}), at);
 			const targetToken = params.targetToken ?? sdk.marketRegister.findCreditManager(strategy.creditManager).strategyTargetCollateral;
 			if (!targetToken) return require_model_result.sdkErr(require_model_errors_prepare_errors.noStrategyTargetCollateral(strategy.creditManager));
-			let creditAccount;
-			if (params.creditAccount) {
-				const reused = await slice(sdk, params.creditAccount);
-				if (!reused || !(0, viem.isAddressEqual)(reused.creditManager, strategy.creditManager)) return require_model_result.sdkErr(require_model_errors_prepare_errors.creditAccountNotFound(params.creditAccount));
-				if (reused.totalDebt > 0n || reused.tokens.some((t) => t.quota > 0n)) return require_model_result.sdkErr(require_model_errors_prepare_errors.creditAccountNotEmpty(params.creditAccount));
-				creditAccount = reused;
-			}
+			const reused = await reusable(sdk, strategy, params.creditAccount);
+			if (reused && "error" in reused) return reused;
+			const creditAccount = reused?.account;
 			return opened(await service(sdk).openStrategyIntent({
 				sdk,
 				creditManager: strategy.creditManager,
@@ -232,6 +239,30 @@ var PrepareApi = class extends require_onchain_base_MultichainConstruct.Multicha
 		}
 	}
 	/**
+	* {@inheritDoc IOpportunitiesPrepare.borrow}
+	**/
+	async borrow(strategy, params) {
+		try {
+			const sdk = await this.#chain(strategy.chainId);
+			const at = stateBlock(sdk);
+			const reused = await reusable(sdk, strategy, params.creditAccount);
+			if (reused && "error" in reused) return reused;
+			return borrowed(await service(sdk).borrowIntent({
+				sdk,
+				creditManager: strategy.creditManager,
+				collateralToken: params.collateralToken,
+				collateralAmount: params.collateralAmount,
+				borrowToken: params.borrowToken,
+				borrowAmount: params.borrowAmount,
+				slippage: params.slippage,
+				quotaReserve: params.quotaReserve,
+				creditAccount: reused?.account
+			}), at);
+		} catch (e) {
+			return require_model_result.sdkErr(require_model_errors_prepare_errors.unexpectedFailure(e));
+		}
+	}
+	/**
 	* {@inheritDoc IOpportunitiesPrepare.depositStrategy}
 	**/
 	async depositStrategy(position, params) {
@@ -259,12 +290,13 @@ var PrepareApi = class extends require_onchain_base_MultichainConstruct.Multicha
 	/**
 	* {@inheritDoc IOpportunitiesPrepare.maxWithdraw}
 	**/
-	async maxWithdraw(position) {
+	async maxWithdraw(position, sourceToken) {
 		const sdk = await this.#chain(position.chainId);
 		const creditAccount = await this.#account(sdk, position);
 		return service(sdk).maxWithdraw({
 			creditAccount,
-			sdk
+			sdk,
+			sourceToken
 		});
 	}
 	/**
@@ -353,6 +385,21 @@ var PrepareApi = class extends require_onchain_base_MultichainConstruct.Multicha
 		});
 	}
 	/**
+	* {@inheritDoc IOpportunitiesPrepare.maxBorrow}
+	**/
+	maxBorrow(strategy, params) {
+		const sdk = this.sdk.chain(strategy.chainId);
+		return service(sdk).maxBorrow({
+			sdk,
+			creditManager: strategy.creditManager,
+			collateralToken: params.collateralToken,
+			collateralAmount: params.collateralAmount,
+			borrowToken: params.borrowToken,
+			targetHF: params.targetHF,
+			quotaReserve: params.quotaReserve
+		});
+	}
+	/**
 	* The account a bare `max*` read weighs. These reads answer a number, not
 	* an envelope, so an account the markets do not hold is thrown rather than
 	* described, see {@link IOpportunitiesPrepare.maxWithdraw}.
@@ -438,6 +485,25 @@ async function slice(sdk, creditAccount) {
 	return data && require_onchain_accounts_intents_utils_credit_account_slice.toCreditAccountSlice(data);
 }
 /**
+* The pre-opened account a request asks to be run on, held to what "pre-opened"
+* means: this manager's, owing nothing and holding no quota.
+*
+* Shared by the two flows that put something on a fresh account — an opening
+* and a borrow — so both hold a reused one to the same terms. Whatever
+* balances sit on it are left to the flow: an opening routes them, a borrow
+* leaves them where they are.
+*
+* @returns Nothing when the request named no account, the refusal to answer
+* with when it named one that does not qualify, and the slice otherwise
+**/
+async function reusable(sdk, strategy, creditAccount) {
+	if (!creditAccount) return;
+	const account = await slice(sdk, creditAccount);
+	if (!account || !(0, viem.isAddressEqual)(account.creditManager, strategy.creditManager)) return require_model_result.sdkErr(require_model_errors_prepare_errors.creditAccountNotFound(creditAccount));
+	if (account.totalDebt > 0n || account.tokens.some((t) => t.quota > 0n)) return require_model_result.sdkErr(require_model_errors_prepare_errors.creditAccountNotEmpty(creditAccount));
+	return { account };
+}
+/**
 * The operation a claim resumes, or `undefined` when there is none to resume:
 * a withdrawal requested without an intent, or one read through a compressor
 * too old to report it. Every intent the engine records can be finished,
@@ -537,6 +603,15 @@ function opened(result, at) {
 }
 /**
 * {@inheritDoc planned}
+**/
+function borrowed(result, at) {
+	return result.ok ? require_model_result.sdkOk({
+		state: result.state,
+		...at
+	}) : methodError(result);
+}
+/**
+* {@inheritDoc planned}
 *
 * Both routes are payload, error and all: `errors` says why a missing one is
 * missing, and it stays on the error when neither route answered, since that is

package/dist/esm/dev/index.js

@@ -13,10 +13,10 @@ import { detectChain } from "./detectChain.js";
 import { isOutOfSyncError } from "./isOutOfSyncError.js";
 import { isRateLimitError } from "./isRateLimitError.js";
 import { isTransientError } from "./isTransientError.js";
-import { greenlistMidasGateway, registerMidasInvestor, registerRWAInvestor, registerSecuritizeInvestor, writeAndWait } from "./kycUtils.js";
+import { collectMidasGateways, collectMidasMTokens, unpauseMidasIssuanceVault } from "./midasUtils.js";
+import { greenlistMidasGateway, registerMidasInvestor, registerRWAInvestor, registerSecuritizeInvestor } from "./kycUtils.js";
 import { isRangeError, logSplitterTransport } from "./logSplitterTransport.js";
 import { setLTZero, setLTs } from "./ltUtils.js";
-import { unpauseMidasIssuanceVault } from "./midasUtils.js";
 import { migrateFaucet } from "./migrateFaucet.js";
 import { SUPPORTED_RPC_PROVIDERS, getAlchemyUrl, getAnkrUrl, getDrpcUrl, getErpcKey, getRpcProviderUrl, getThirdWebUrl, rpcProvidersSchema } from "./providers.js";
 import { replaceStorage } from "./replaceStorage.js";
@@ -25,4 +25,4 @@ import { claimDSToken, claimDSTokens, enableDSTokenBackDating } from "./securiti
 import "./types.js";
 import { ONCHAIN_EXECUTION_ID_ADDRESS, verifyTestnet } from "./verifyTestnet.js";
 import { makePendingWithdrawalsClaimable } from "./withdrawalUtils.js";
-export { AccountOpener, Create2Deployer, DEFAULT_CREATE2_SALT, EthCallSpy, NoAvailableTransportsError, ONCHAIN_EXECUTION_ID_ADDRESS, OpenTxRevertedError, PUBLIC_CREATE2_FACTORY, RevolverTransport, SUPPORTED_RPC_PROVIDERS, SelectionStrategy, anvilNodeInfo, calcLiquidatableLTs, claimDSToken, claimDSTokens, claimFromFaucet, createAnvilClient, createMinter, deployUsingPublicCreate2, detectChain, enableDSTokenBackDating, evmMineDetailed, extendAnvilClient, getAlchemyUrl, getAnkrUrl, getDrpcUrl, getErpcKey, getPublicCreate2Address, getRpcProviderUrl, getThirdWebUrl, greenlistMidasGateway, httpTransportOptionsSchema, iDegenNftv2Abi, iFaucetAbi, iOnchainExecutionIdAbi, iOwnableAbi, iaclTraitAbi, isAnvil, isDeployedUsingPublicCreate2, isOutOfSyncError, isRangeError, isRateLimitError, isTransientError, logSplitterTransport, makePendingWithdrawalsClaimable, migrateFaucet, providerConfigSchema, registerMidasInvestor, registerRWAInvestor, registerSecuritizeInvestor, replaceStorage, resilientTransport, resilientTransportOptionsSchema, revolverTransportConfigBaseSchema, revolverTransportConfigSchema, rpcProvidersSchema, setLTZero, setLTs, unpauseMidasIssuanceVault, verifyTestnet, writeAndWait };
+export { AccountOpener, Create2Deployer, DEFAULT_CREATE2_SALT, EthCallSpy, NoAvailableTransportsError, ONCHAIN_EXECUTION_ID_ADDRESS, OpenTxRevertedError, PUBLIC_CREATE2_FACTORY, RevolverTransport, SUPPORTED_RPC_PROVIDERS, SelectionStrategy, anvilNodeInfo, calcLiquidatableLTs, claimDSToken, claimDSTokens, claimFromFaucet, collectMidasGateways, collectMidasMTokens, createAnvilClient, createMinter, deployUsingPublicCreate2, detectChain, enableDSTokenBackDating, evmMineDetailed, extendAnvilClient, getAlchemyUrl, getAnkrUrl, getDrpcUrl, getErpcKey, getPublicCreate2Address, getRpcProviderUrl, getThirdWebUrl, greenlistMidasGateway, httpTransportOptionsSchema, iDegenNftv2Abi, iFaucetAbi, iOnchainExecutionIdAbi, iOwnableAbi, iaclTraitAbi, isAnvil, isDeployedUsingPublicCreate2, isOutOfSyncError, isRangeError, isRateLimitError, isTransientError, logSplitterTransport, makePendingWithdrawalsClaimable, migrateFaucet, providerConfigSchema, registerMidasInvestor, registerRWAInvestor, registerSecuritizeInvestor, replaceStorage, resilientTransport, resilientTransportOptionsSchema, revolverTransportConfigBaseSchema, revolverTransportConfigSchema, rpcProvidersSchema, setLTZero, setLTs, unpauseMidasIssuanceVault, verifyTestnet };

package/dist/esm/dev/kycUtils.js

@@ -4,23 +4,12 @@ import { OnchainSDK } from "../onchain/OnchainSDK.js";
 import "../onchain/index.js";
 import { iDSRegistryServiceAbi } from "../abi/rwa/iDSRegistryService.js";
 import { iDSTokenAbi } from "../abi/rwa/iDSToken.js";
+import { collectMidasGateways } from "./midasUtils.js";
 import { midasGatewayAbi } from "./withdrawalAbi.js";
 import { isAddressEqual, parseAbi, parseEther, zeroAddress } from "viem";
 import { privateKeyToAccount } from "viem/accounts";
 //#region src/dev/kycUtils.ts
 /**
-* Writes to a contract, mines a block and waits for the receipt
-*/
-async function writeAndWait(anvil, params) {
-	const hash = await anvil.writeContract(params);
-	await anvil.mine({ blocks: 1 });
-	await anvil.waitForTransactionReceipt({
-		hash,
-		pollingInterval: 100
-	});
-	return hash;
-}
-/**
 * Resolves the account that performs the DS registry writes: either the admin
 * private key, or the admin address impersonated on the fork
 */
@@ -98,36 +87,39 @@ async function registerSecuritizeInvestor(props) {
 		const { account, release } = await useSecuritizeAdmin(props);
 		try {
 			if (!investorExists) {
-				await writeAndWait(anvil, {
+				await anvil.writeContractSync({
 					account,
 					chain: anvil.chain,
 					address: registryService,
 					abi: iDSRegistryServiceAbi,
 					functionName: "registerInvestor",
-					args: [investorId, investorId]
+					args: [investorId, investorId],
+					throwOnReceiptRevert: true
 				});
 				logger?.debug(`Registered investor "${investorId}"`);
 			}
-			await writeAndWait(anvil, {
+			await anvil.writeContractSync({
 				account,
 				chain: anvil.chain,
 				address: registryService,
 				abi: iDSRegistryServiceAbi,
 				functionName: "addWallet",
-				args: [investor, investorId]
+				args: [investor, investorId],
+				throwOnReceiptRevert: true
 			});
 			logger?.debug(`Added wallet ${investor} for investor "${investorId}"`);
 			try {
-				await writeAndWait(anvil, {
+				await anvil.writeContractSync({
 					account,
 					chain: anvil.chain,
 					address: registryService,
 					abi: iDSRegistryServiceAbi,
 					functionName: "setCountry",
-					args: [investorId, "US"]
+					args: [investorId, "US"],
+					throwOnReceiptRevert: true
 				});
 				logger?.debug(`Set country for investor "${investorId}" to "US"`);
-				await writeAndWait(anvil, {
+				await anvil.writeContractSync({
 					account,
 					chain: anvil.chain,
 					address: registryService,
@@ -139,7 +131,8 @@ async function registerSecuritizeInvestor(props) {
 						BigInt(APPROVED),
 						MAX_UINT256,
 						"fake proof"
-					]
+					],
+					throwOnReceiptRevert: true
 				});
 				logger?.debug(`Set attributes for investor "${investorId}"`);
 			} catch (e) {
@@ -241,13 +234,14 @@ async function greenlistMidasGateway(props) {
 				logger?.debug(`midas: ${account} already has role ${role}`);
 				continue;
 			}
-			await writeAndWait(anvil, {
+			await anvil.writeContractSync({
 				account: admin,
 				chain: anvil.chain,
 				address: accessControl,
 				abi: iMidasAccessControlAbi,
 				functionName: "grantRole",
-				args: [role, account]
+				args: [role, account],
+				throwOnReceiptRevert: true
 			});
 			logger?.debug(`midas: granted role ${role} to ${account}`);
 		}
@@ -294,16 +288,6 @@ async function findMidasGateway(props) {
 	return candidates[index];
 }
 /**
-* Collects the target contracts of all Midas gateway adapters of the loaded
-* credit managers, same as the foundry tests do with
-* `ICreditConfiguratorV3.allowedAdapters`
-*/
-function collectMidasGateways(sdk) {
-	const gateways = new AddressSet();
-	for (const cm of sdk.marketRegister.creditManagers) for (const adapter of cm.creditManager.adapters.values()) if (adapter.contractType === "ADAPTER::MIDAS_GATEWAY") gateways.add(adapter.targetContract);
-	return gateways.asArray();
-}
-/**
 * Registers a wallet as an investor (fake KYC) in every Securitize DSToken and
 * every Midas gateway of the markets loaded by `sdk`.
 *
@@ -361,4 +345,4 @@ async function registerRWAInvestor(props) {
 	};
 }
 //#endregion
-export { greenlistMidasGateway, registerMidasInvestor, registerRWAInvestor, registerSecuritizeInvestor, writeAndWait };
+export { greenlistMidasGateway, registerMidasInvestor, registerRWAInvestor, registerSecuritizeInvestor };

package/dist/esm/dev/midasUtils.js

@@ -1,4 +1,6 @@
-import { writeAndWait } from "./kycUtils.js";
+import { AddressSet } from "../onchain/utils/AddressSet.js";
+import { MidasGatewayAdapterContract } from "../onchain/market/adapters/contracts/MidasGatewayAdapterContract.js";
+import "../onchain/index.js";
 import { parseAbi, parseEther, toFunctionSelector } from "viem";
 //#region src/dev/midasUtils.ts
 /**
@@ -77,30 +79,33 @@ async function unpauseMidasIssuanceVault(props) {
 			value: parseEther("100")
 		});
 		if (!isPauseAdmin) {
-			await writeAndWait(anvil, {
+			await anvil.writeContractSync({
 				account: admin,
 				chain: anvil.chain,
 				address: accessControl,
 				abi: iMidasAccessControlAbi,
 				functionName: "grantRole",
-				args: [pauseAdminRole, admin]
+				args: [pauseAdminRole, admin],
+				throwOnReceiptRevert: true
 			});
 			logger?.debug(`midas: granted pause admin role to ${admin}`);
 		}
-		if (paused) await writeAndWait(anvil, {
+		if (paused) await anvil.writeContractSync({
 			account: admin,
 			chain: anvil.chain,
 			address: vault,
 			abi: iMidasPausableVaultAbi,
-			functionName: "unpause"
+			functionName: "unpause",
+			throwOnReceiptRevert: true
 		});
-		if (depositInstantPaused) await writeAndWait(anvil, {
+		if (depositInstantPaused) await anvil.writeContractSync({
 			account: admin,
 			chain: anvil.chain,
 			address: vault,
 			abi: iMidasPausableVaultAbi,
 			functionName: "unpauseFn",
-			args: [DEPOSIT_INSTANT_SELECTOR]
+			args: [DEPOSIT_INSTANT_SELECTOR],
+			throwOnReceiptRevert: true
 		});
 	} finally {
 		await anvil.stopImpersonatingAccount({ address: admin });
@@ -116,20 +121,22 @@ async function unpauseMidasIssuanceVault(props) {
 				address: admin,
 				value: parseEther("100")
 			});
-			if (paused) await writeAndWait(anvil, {
+			if (paused) await anvil.writeContractSync({
 				account: admin,
 				chain: anvil.chain,
 				address: vault,
 				abi: iMidasPausableVaultAbi,
-				functionName: "pause"
+				functionName: "pause",
+				throwOnReceiptRevert: true
 			});
-			if (depositInstantPaused) await writeAndWait(anvil, {
+			if (depositInstantPaused) await anvil.writeContractSync({
 				account: admin,
 				chain: anvil.chain,
 				address: vault,
 				abi: iMidasPausableVaultAbi,
 				functionName: "pauseFn",
-				args: [DEPOSIT_INSTANT_SELECTOR]
+				args: [DEPOSIT_INSTANT_SELECTOR],
+				throwOnReceiptRevert: true
 			});
 		} catch (e) {
 			logger?.warn(`midas: failed to pause issuance vault ${vault} back: ${e}`);
@@ -138,5 +145,25 @@ async function unpauseMidasIssuanceVault(props) {
 		}
 	};
 }
+function* midasGatewayAdapters(sdk) {
+	for (const cm of sdk.marketRegister.creditManagers) for (const adapter of cm.creditManager.adapters.values()) if (adapter instanceof MidasGatewayAdapterContract) yield adapter;
+}
+/**
+* Target contracts of all Midas gateway adapters of the loaded credit managers,
+* same as the foundry tests do with `ICreditConfiguratorV3.allowedAdapters`
+*/
+function collectMidasGateways(sdk) {
+	const gateways = new AddressSet();
+	for (const adapter of midasGatewayAdapters(sdk)) gateways.add(adapter.targetContract);
+	return gateways.asArray();
+}
+/**
+* mTokens of all Midas gateway adapters of the loaded credit managers
+*/
+function collectMidasMTokens(sdk) {
+	const mTokens = new AddressSet();
+	for (const adapter of midasGatewayAdapters(sdk)) mTokens.add(adapter.mToken);
+	return mTokens.asArray();
+}
 //#endregion
-export { unpauseMidasIssuanceVault };
+export { collectMidasGateways, collectMidasMTokens, unpauseMidasIssuanceVault };

package/dist/esm/dev/securitizeUtils.js

@@ -2,7 +2,7 @@ import { AddressSet } from "../onchain/utils/AddressSet.js";
 import { OnchainSDK } from "../onchain/OnchainSDK.js";
 import "../onchain/index.js";
 import { iDSTokenAbi } from "../abi/rwa/iDSToken.js";
-import { registerSecuritizeInvestor, writeAndWait } from "./kycUtils.js";
+import { registerSecuritizeInvestor } from "./kycUtils.js";
 import { erc20Abi, isAddressEqual, parseAbi, zeroAddress } from "viem";
 import { privateKeyToAccount } from "viem/accounts";
 //#region src/dev/securitizeUtils.ts
@@ -64,7 +64,7 @@ async function issueDSTokens(props) {
 		const { timestamp } = await anvil.getBlock();
 		const issuanceTime = timestamp - lockPeriod - 1n;
 		try {
-			const hash = await writeAndWait(anvil, {
+			const receipt = await anvil.writeContractSync({
 				account,
 				chain: anvil.chain,
 				address: token,
@@ -77,14 +77,15 @@ async function issueDSTokens(props) {
 					0n,
 					"",
 					0n
-				]
+				],
+				throwOnReceiptRevert: true
 			});
 			logger?.debug({
 				issuanceTime,
 				investor,
 				amount
 			}, "issueTokensCustom successful");
-			return hash;
+			return receipt.transactionHash;
 		} catch (e) {
 			logger?.debug(`issueTokensCustom failed: ${e}`);
 		}
@@ -93,14 +94,15 @@ async function issueDSTokens(props) {
 		investor,
 		amount
 	}, "Falling back to issueTokens");
-	return writeAndWait(anvil, {
+	return (await anvil.writeContractSync({
 		account,
 		chain: anvil.chain,
 		address: token,
 		abi: iDSTokenAbi,
 		functionName: "issueTokens",
-		args: [investor, amount]
-	});
+		args: [investor, amount],
+		throwOnReceiptRevert: true
+	})).transactionHash;
 }
 /**
 * Resolves unique compliance configuration services of `tokens`: several
@@ -160,13 +162,14 @@ async function enableDSTokenBackDating(props) {
 			continue;
 		}
 		logger?.info(`Allowing back-dating on ${service}`);
-		await writeAndWait(anvil, {
+		await anvil.writeContractSync({
 			account,
 			chain: anvil.chain,
 			address: service,
 			abi: iDSComplianceConfigurationServiceAbi,
 			functionName: "setDisallowBackDating",
-			args: [false]
+			args: [false],
+			throwOnReceiptRevert: true
 		});
 		toRestore.push(service);
 	}
@@ -176,13 +179,14 @@ async function enableDSTokenBackDating(props) {
 		for (const service of services) {
 			logger?.info(`Disallowing back-dating on ${service}`);
 			try {
-				await writeAndWait(anvil, {
+				await anvil.writeContractSync({
 					account,
 					chain: anvil.chain,
 					address: service,
 					abi: iDSComplianceConfigurationServiceAbi,
 					functionName: "setDisallowBackDating",
-					args: [true]
+					args: [true],
+					throwOnReceiptRevert: true
 				});
 			} catch (e) {
 				logger?.warn(`Failed to restore disallowBackDating on ${service}: ${e}`);