@gearbox-protocol/sdk 16.4.0 → 16.4.1

package/dist/cjs/dev/index.js

@@ -14,10 +14,10 @@ const require_dev_detectChain = require("./detectChain.js");
 const require_dev_isOutOfSyncError = require("./isOutOfSyncError.js");
 const require_dev_isRateLimitError = require("./isRateLimitError.js");
 const require_dev_isTransientError = require("./isTransientError.js");
+const require_dev_midasUtils = require("./midasUtils.js");
 const require_dev_kycUtils = require("./kycUtils.js");
 const require_dev_logSplitterTransport = require("./logSplitterTransport.js");
 const require_dev_ltUtils = require("./ltUtils.js");
-const require_dev_midasUtils = require("./midasUtils.js");
 const require_dev_migrateFaucet = require("./migrateFaucet.js");
 const require_dev_providers = require("./providers.js");
 const require_dev_replaceStorage = require("./replaceStorage.js");
@@ -42,6 +42,8 @@ exports.calcLiquidatableLTs = require_dev_calcLiquidatableLTs.calcLiquidatableLT
 exports.claimDSToken = require_dev_securitizeUtils.claimDSToken;
 exports.claimDSTokens = require_dev_securitizeUtils.claimDSTokens;
 exports.claimFromFaucet = require_dev_claimFromFaucet.claimFromFaucet;
+exports.collectMidasGateways = require_dev_midasUtils.collectMidasGateways;
+exports.collectMidasMTokens = require_dev_midasUtils.collectMidasMTokens;
 exports.createAnvilClient = require_dev_createAnvilClient.createAnvilClient;
 exports.createMinter = require_dev_mint_factory.createMinter;
 exports.deployUsingPublicCreate2 = require_dev_create2.deployUsingPublicCreate2;
@@ -86,4 +88,3 @@ exports.setLTZero = require_dev_ltUtils.setLTZero;
 exports.setLTs = require_dev_ltUtils.setLTs;
 exports.unpauseMidasIssuanceVault = require_dev_midasUtils.unpauseMidasIssuanceVault;
 exports.verifyTestnet = require_dev_verifyTestnet.verifyTestnet;
-exports.writeAndWait = require_dev_kycUtils.writeAndWait;

package/dist/cjs/dev/kycUtils.js

@@ -5,23 +5,12 @@ const require_onchain_OnchainSDK = require("../onchain/OnchainSDK.js");
 require("../onchain/index.js");
 const require_abi_rwa_iDSRegistryService = require("../abi/rwa/iDSRegistryService.js");
 const require_abi_rwa_iDSToken = require("../abi/rwa/iDSToken.js");
+const require_dev_midasUtils = require("./midasUtils.js");
 const require_dev_withdrawalAbi = require("./withdrawalAbi.js");
 let viem = require("viem");
 let viem_accounts = require("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
 */
@@ -99,36 +88,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: require_abi_rwa_iDSRegistryService.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: require_abi_rwa_iDSRegistryService.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: require_abi_rwa_iDSRegistryService.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,
@@ -140,7 +132,8 @@ async function registerSecuritizeInvestor(props) {
 						BigInt(APPROVED),
 						require_onchain_constants_math.MAX_UINT256,
 						"fake proof"
-					]
+					],
+					throwOnReceiptRevert: true
 				});
 				logger?.debug(`Set attributes for investor "${investorId}"`);
 			} catch (e) {
@@ -242,13 +235,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}`);
 		}
@@ -280,7 +274,7 @@ async function findMidasGateway(props) {
 		});
 		await sdk.attach({ marketConfigurators });
 	}
-	const candidates = collectMidasGateways(sdk);
+	const candidates = require_dev_midasUtils.collectMidasGateways(sdk);
 	if (candidates.length === 0) throw new Error("no midas gateway adapters found in loaded markets");
 	const index = (await anvil.multicall({
 		allowFailure: false,
@@ -295,16 +289,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 require_onchain_utils_AddressSet.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`.
 *
@@ -336,7 +320,7 @@ async function registerRWAInvestor(props) {
 		});
 	}
 	else if (dsTokens.size > 0) logger?.warn(`securitize: no registry admin, skipping ${dsTokens.size} DSToken(s)`);
-	const gateways = collectMidasGateways(sdk);
+	const gateways = require_dev_midasUtils.collectMidasGateways(sdk);
 	for (const gateway of gateways) try {
 		await greenlistMidasGateway({
 			anvil,
@@ -366,4 +350,3 @@ exports.greenlistMidasGateway = greenlistMidasGateway;
 exports.registerMidasInvestor = registerMidasInvestor;
 exports.registerRWAInvestor = registerRWAInvestor;
 exports.registerSecuritizeInvestor = registerSecuritizeInvestor;
-exports.writeAndWait = writeAndWait;

package/dist/cjs/dev/midasUtils.js

@@ -1,5 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_dev_kycUtils = require("./kycUtils.js");
+const require_onchain_utils_AddressSet = require("../onchain/utils/AddressSet.js");
+const require_onchain_market_adapters_contracts_MidasGatewayAdapterContract = require("../onchain/market/adapters/contracts/MidasGatewayAdapterContract.js");
+require("../onchain/index.js");
 let viem = require("viem");
 //#region src/dev/midasUtils.ts
 /**
@@ -78,30 +80,33 @@ async function unpauseMidasIssuanceVault(props) {
 			value: (0, viem.parseEther)("100")
 		});
 		if (!isPauseAdmin) {
-			await require_dev_kycUtils.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 require_dev_kycUtils.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 require_dev_kycUtils.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 });
@@ -117,20 +122,22 @@ async function unpauseMidasIssuanceVault(props) {
 				address: admin,
 				value: (0, viem.parseEther)("100")
 			});
-			if (paused) await require_dev_kycUtils.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 require_dev_kycUtils.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}`);
@@ -139,5 +146,27 @@ 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 require_onchain_market_adapters_contracts_MidasGatewayAdapterContract.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 require_onchain_utils_AddressSet.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 require_onchain_utils_AddressSet.AddressSet();
+	for (const adapter of midasGatewayAdapters(sdk)) mTokens.add(adapter.mToken);
+	return mTokens.asArray();
+}
 //#endregion
+exports.collectMidasGateways = collectMidasGateways;
+exports.collectMidasMTokens = collectMidasMTokens;
 exports.unpauseMidasIssuanceVault = unpauseMidasIssuanceVault;

package/dist/cjs/dev/securitizeUtils.js

@@ -65,7 +65,7 @@ async function issueDSTokens(props) {
 		const { timestamp } = await anvil.getBlock();
 		const issuanceTime = timestamp - lockPeriod - 1n;
 		try {
-			const hash = await require_dev_kycUtils.writeAndWait(anvil, {
+			const receipt = await anvil.writeContractSync({
 				account,
 				chain: anvil.chain,
 				address: token,
@@ -78,14 +78,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}`);
 		}
@@ -94,14 +95,15 @@ async function issueDSTokens(props) {
 		investor,
 		amount
 	}, "Falling back to issueTokens");
-	return require_dev_kycUtils.writeAndWait(anvil, {
+	return (await anvil.writeContractSync({
 		account,
 		chain: anvil.chain,
 		address: token,
 		abi: require_abi_rwa_iDSToken.iDSTokenAbi,
 		functionName: "issueTokens",
-		args: [investor, amount]
-	});
+		args: [investor, amount],
+		throwOnReceiptRevert: true
+	})).transactionHash;
 }
 /**
 * Resolves unique compliance configuration services of `tokens`: several
@@ -161,13 +163,14 @@ async function enableDSTokenBackDating(props) {
 			continue;
 		}
 		logger?.info(`Allowing back-dating on ${service}`);
-		await require_dev_kycUtils.writeAndWait(anvil, {
+		await anvil.writeContractSync({
 			account,
 			chain: anvil.chain,
 			address: service,
 			abi: iDSComplianceConfigurationServiceAbi,
 			functionName: "setDisallowBackDating",
-			args: [false]
+			args: [false],
+			throwOnReceiptRevert: true
 		});
 		toRestore.push(service);
 	}
@@ -177,13 +180,14 @@ async function enableDSTokenBackDating(props) {
 		for (const service of services) {
 			logger?.info(`Disallowing back-dating on ${service}`);
 			try {
-				await require_dev_kycUtils.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}`);

package/dist/cjs/dev/withdrawalUtils.js

@@ -205,18 +205,15 @@ async function fulfillMidasRedeemer(anvil, redeemer, logger) {
 		address: MIDAS_VAULT_ADMIN,
 		value: (0, viem.parseEther)("100")
 	});
-	const hash = await anvil.writeContract({
+	await anvil.writeContractSync({
 		chain: anvil.chain,
 		address: midasRedemptionVault,
 		account: MIDAS_VAULT_ADMIN,
 		abi: iMidasRedemptionVaultExtAbi,
 		functionName: "safeApproveRequest",
-		args: [requestId, mTokenRate]
+		args: [requestId, mTokenRate],
+		throwOnReceiptRevert: true
 	});
-	if ((await anvil.waitForTransactionReceipt({
-		hash,
-		pollingInterval: 100
-	})).status !== "success") throw new Error(`midas: safeApproveRequest tx ${hash} reverted`);
 	await anvil.stopImpersonatingAccount({ address: MIDAS_VAULT_ADMIN });
 }
 /**

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}`);

package/dist/esm/dev/withdrawalUtils.js

@@ -204,18 +204,15 @@ async function fulfillMidasRedeemer(anvil, redeemer, logger) {
 		address: MIDAS_VAULT_ADMIN,
 		value: parseEther("100")
 	});
-	const hash = await anvil.writeContract({
+	await anvil.writeContractSync({
 		chain: anvil.chain,
 		address: midasRedemptionVault,
 		account: MIDAS_VAULT_ADMIN,
 		abi: iMidasRedemptionVaultExtAbi,
 		functionName: "safeApproveRequest",
-		args: [requestId, mTokenRate]
+		args: [requestId, mTokenRate],
+		throwOnReceiptRevert: true
 	});
-	if ((await anvil.waitForTransactionReceipt({
-		hash,
-		pollingInterval: 100
-	})).status !== "success") throw new Error(`midas: safeApproveRequest tx ${hash} reverted`);
 	await anvil.stopImpersonatingAccount({ address: MIDAS_VAULT_ADMIN });
 }
 /**

package/dist/types/dev/index.d.ts

@@ -11,10 +11,10 @@ import { detectChain } from "./detectChain.js";
 import { isOutOfSyncError } from "./isOutOfSyncError.js";
 import { isRateLimitError } from "./isRateLimitError.js";
 import { isTransientError } from "./isTransientError.js";
-import { GreenlistMidasGatewayProps, RWAKycFailure, RegisterMidasInvestorProps, RegisterRWAInvestorProps, RegisterRWAInvestorResult, RegisterSecuritizeInvestorProps, greenlistMidasGateway, registerMidasInvestor, registerRWAInvestor, registerSecuritizeInvestor, writeAndWait } from "./kycUtils.js";
+import { GreenlistMidasGatewayProps, RWAKycFailure, RegisterMidasInvestorProps, RegisterRWAInvestorProps, RegisterRWAInvestorResult, RegisterSecuritizeInvestorProps, greenlistMidasGateway, registerMidasInvestor, registerRWAInvestor, registerSecuritizeInvestor } from "./kycUtils.js";
 import { LogSplitterTransportOptions, isRangeError, logSplitterTransport } from "./logSplitterTransport.js";
 import { setLTZero, setLTs } from "./ltUtils.js";
-import { RestoreMidasIssuanceVaultPause, UnpauseMidasIssuanceVaultProps, unpauseMidasIssuanceVault } from "./midasUtils.js";
+import { RestoreMidasIssuanceVaultPause, UnpauseMidasIssuanceVaultProps, collectMidasGateways, collectMidasMTokens, unpauseMidasIssuanceVault } from "./midasUtils.js";
 import { migrateFaucet } from "./migrateFaucet.js";
 import { IMinter } from "./mint/types.js";
 import { createMinter } from "./mint/factory.js";
@@ -26,4 +26,4 @@ import { EnableDSTokenBackDatingProps, RestoreDSTokenBackDating, claimDSToken, c
 import { httpTransportOptionsSchema } from "./transports.js";
 import { ONCHAIN_EXECUTION_ID_ADDRESS, VerifyTestnetParams, verifyTestnet } from "./verifyTestnet.js";
 import { MakePendingWithdrawalsClaimableOptions, makePendingWithdrawalsClaimable } from "./withdrawalUtils.js";
-export { AccountOpener, AccountOpenerOptions, AnvilActions, AnvilClient, AnvilClientConfig, AnvilDealParameters, AnvilNodeInfo, AnvilRPCSchema, CheckMulticallFn, Create2Deployer, Create2Parameters, DEFAULT_CREATE2_SALT, DetectedCall, EnableDSTokenBackDatingProps, EnsureExistsUsingPublicCreate2ReturnType, EthCallMethod, EthCallRequest, EthCallSpy, GetCreate2AddressParameters, GreenlistMidasGatewayProps, IMinter, type LogSplitterTransportOptions, MakePendingWithdrawalsClaimableOptions, NoAvailableTransportsError, ONCHAIN_EXECUTION_ID_ADDRESS, OpenAccountHumanizedPreview, OpenAccountResult, OpenAccountsResult, OpenTxRevertedError, PUBLIC_CREATE2_FACTORY, PoolDepositResult, ProviderConfig, ProviderStatus, RWAKycFailure, RegisterMidasInvestorProps, RegisterRWAInvestorProps, RegisterRWAInvestorResult, RegisterSecuritizeInvestorProps, ReplaceStorageParams, ResilientTransportOptions, RestoreDSTokenBackDating, RestoreMidasIssuanceVaultPause, RevolverTransport, RevolverTransportConfig, RevolverTransportValue, RpcErrorResult, RpcProvider, RpcResponse, RpcSuccessResult, SUPPORTED_RPC_PROVIDERS, SelectionStrategy, TargetAccount, UnpauseMidasIssuanceVaultProps, VerifyTestnetParams, 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, AccountOpenerOptions, AnvilActions, AnvilClient, AnvilClientConfig, AnvilDealParameters, AnvilNodeInfo, AnvilRPCSchema, CheckMulticallFn, Create2Deployer, Create2Parameters, DEFAULT_CREATE2_SALT, DetectedCall, EnableDSTokenBackDatingProps, EnsureExistsUsingPublicCreate2ReturnType, EthCallMethod, EthCallRequest, EthCallSpy, GetCreate2AddressParameters, GreenlistMidasGatewayProps, IMinter, type LogSplitterTransportOptions, MakePendingWithdrawalsClaimableOptions, NoAvailableTransportsError, ONCHAIN_EXECUTION_ID_ADDRESS, OpenAccountHumanizedPreview, OpenAccountResult, OpenAccountsResult, OpenTxRevertedError, PUBLIC_CREATE2_FACTORY, PoolDepositResult, ProviderConfig, ProviderStatus, RWAKycFailure, RegisterMidasInvestorProps, RegisterRWAInvestorProps, RegisterRWAInvestorResult, RegisterSecuritizeInvestorProps, ReplaceStorageParams, ResilientTransportOptions, RestoreDSTokenBackDating, RestoreMidasIssuanceVaultPause, RevolverTransport, RevolverTransportConfig, RevolverTransportValue, RpcErrorResult, RpcProvider, RpcResponse, RpcSuccessResult, SUPPORTED_RPC_PROVIDERS, SelectionStrategy, TargetAccount, UnpauseMidasIssuanceVaultProps, VerifyTestnetParams, 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/types/dev/kycUtils.d.ts

@@ -4,10 +4,6 @@ import "../onchain/index.js";
 import { AnvilClient } from "./createAnvilClient.js";
 import { Address, Hex } from "viem";
 //#region src/dev/kycUtils.d.ts
-/**
- * Writes to a contract, mines a block and waits for the receipt
- */
-declare function writeAndWait(anvil: AnvilClient, params: Parameters<AnvilClient["writeContract"]>[0]): Promise<Hex>;
 interface RegisterSecuritizeInvestorProps {
   anvil: AnvilClient;
   /**
@@ -138,4 +134,4 @@ interface RegisterRWAInvestorResult {
  */
 declare function registerRWAInvestor(props: RegisterRWAInvestorProps): Promise<RegisterRWAInvestorResult>;
 //#endregion
-export { GreenlistMidasGatewayProps, RWAKycFailure, RegisterMidasInvestorProps, RegisterRWAInvestorProps, RegisterRWAInvestorResult, RegisterSecuritizeInvestorProps, greenlistMidasGateway, registerMidasInvestor, registerRWAInvestor, registerSecuritizeInvestor, writeAndWait };
+export { GreenlistMidasGatewayProps, RWAKycFailure, RegisterMidasInvestorProps, RegisterRWAInvestorProps, RegisterRWAInvestorResult, RegisterSecuritizeInvestorProps, greenlistMidasGateway, registerMidasInvestor, registerRWAInvestor, registerSecuritizeInvestor };

package/dist/types/dev/midasUtils.d.ts

@@ -1,4 +1,5 @@
 import { ILogger } from "../onchain/types/logger.js";
+import { OnchainSDK } from "../onchain/OnchainSDK.js";
 import "../onchain/index.js";
 import { AnvilClient } from "./createAnvilClient.js";
 import { Address } from "viem";
@@ -32,5 +33,14 @@ type RestoreMidasIssuanceVaultPause = () => Promise<void>;
  * reverted by the callback, only the pause state is.
  */
 declare function unpauseMidasIssuanceVault(props: UnpauseMidasIssuanceVaultProps): Promise<RestoreMidasIssuanceVaultPause>;
+/**
+ * Target contracts of all Midas gateway adapters of the loaded credit managers,
+ * same as the foundry tests do with `ICreditConfiguratorV3.allowedAdapters`
+ */
+declare function collectMidasGateways(sdk: OnchainSDK): Address[];
+/**
+ * mTokens of all Midas gateway adapters of the loaded credit managers
+ */
+declare function collectMidasMTokens(sdk: OnchainSDK): Address[];
 //#endregion
-export { RestoreMidasIssuanceVaultPause, UnpauseMidasIssuanceVaultProps, unpauseMidasIssuanceVault };
+export { RestoreMidasIssuanceVaultPause, UnpauseMidasIssuanceVaultProps, collectMidasGateways, collectMidasMTokens, unpauseMidasIssuanceVault };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "16.4.0",
+  "version": "16.4.1",
   "description": "Gearbox SDK",
   "license": "MIT",
   "repository": {