[filler-v2, sdk, indexer]: fx strategy, intentsV2 refactor, partial fills indexing

package.json

@@ -69,7 +69,7 @@
 		"node": ">=22",
 		"pnpm": ">=7"
 	},
-	"packageManager": "pnpm@9.15.0+sha256.09a8fe31a34fda706354680619f4002f4ccef6dadff93240d24ef6c831f0fd28",
+	"packageManager": "pnpm@10.30.3",
 	"dependencies": {
 		"jest": "^29.7.0",
 		"ts-node": "^10.9.2"

packages/filler-v2/filler-config-example.toml

@@ -23,14 +23,6 @@ substratePrivateKey = ""
 # Hyperbridge WebSocket URL
 hyperbridgeWsUrl = ""
 
-# ERC-4337 EntryPoint contract address
-entryPointAddress = ""
-
-# Address of the deployed SolverAccount.sol contract
-# The filler's EOA will delegate to this contract via EIP-7702
-# This enables the filler to participate in solver selection mode
-solverAccountContractAddress = ""
-
 # ERC-4337 bundler URL for UserOperation gas estimation
 bundlerUrl = ""
 

packages/filler-v2/package.json

@@ -24,6 +24,7 @@
 		"test:services": "vitest --watch=false --maxConcurrency=1 --testTimeout=1000000 src/tests/services.test.ts",
 		"test:filler": "vitest --watch=false --maxConcurrency=1 --testTimeout=1000000 src/tests/filler.test.ts",
 		"test:watch": "vitest",
+		"test:delegation": "vitest --watch=false --maxConcurrency=1 --testTimeout=1000000 src/tests/delegation.test.ts",
 		"lint": "biome lint .",
 		"lint:fix": "biome lint --write .",
 		"format": "prettier --write \"src/**/*.ts\"",

packages/filler-v2/src/bin/filler.ts

@@ -152,7 +152,6 @@ program
 				substratePrivateKey: config.filler.substratePrivateKey,
 				hyperbridgeWsUrl: config.filler.hyperbridgeWsUrl,
 				entryPointAddress: config.filler.entryPointAddress,
-				solverAccountContractAddress: config.filler.solverAccountContractAddress,
 				dataDir: config.filler.dataDir,
 				bundlerUrl: config.filler.bundlerUrl,
 				rebalancing: config.rebalancing,
@@ -310,15 +309,15 @@ program
 			)
 
 			// Handle graceful shutdown
-			process.on("SIGINT", () => {
+			process.on("SIGINT", async () => {
 				logger.warn("Shutting down intent filler (SIGINT)...")
-				intentFiller.stop()
+				await intentFiller.stop()
 				process.exit(0)
 			})
 
-			process.on("SIGTERM", () => {
+			process.on("SIGTERM", async () => {
 				logger.warn("Shutting down intent filler (SIGTERM)...")
-				intentFiller.stop()
+				await intentFiller.stop()
 				process.exit(0)
 			})
 

packages/filler-v2/src/config/abis/Entrypoint.ts

@@ -0,0 +1,12 @@
+export const ENTRYPOINT_ABI = [
+	{
+		inputs: [
+			{ name: "sender", type: "address" },
+			{ name: "key", type: "uint192" },
+		],
+		name: "getNonce",
+		outputs: [{ name: "nonce", type: "uint256" }],
+		stateMutability: "view",
+		type: "function",
+	},
+] as const

packages/filler-v2/src/config/abis/IntentGatewayV2.ts

@@ -19,6 +19,54 @@ export const INTENT_GATEWAY_V2_ABI = [
 		outputs: [{ name: "", type: "bytes32", internalType: "bytes32" }],
 		stateMutability: "view",
 	},
+	{
+		type: "function",
+		name: "_destinationProtocolFees",
+		inputs: [{ name: "", type: "bytes32", internalType: "bytes32" }],
+		outputs: [{ name: "", type: "uint256", internalType: "uint256" }],
+		stateMutability: "view",
+	},
+	{
+		type: "function",
+		name: "_filled",
+		inputs: [{ name: "", type: "bytes32", internalType: "bytes32" }],
+		outputs: [{ name: "", type: "address", internalType: "address" }],
+		stateMutability: "view",
+	},
+	{
+		type: "function",
+		name: "_instances",
+		inputs: [{ name: "", type: "bytes32", internalType: "bytes32" }],
+		outputs: [{ name: "", type: "address", internalType: "address" }],
+		stateMutability: "view",
+	},
+	{
+		type: "function",
+		name: "_nonce",
+		inputs: [],
+		outputs: [{ name: "", type: "uint256", internalType: "uint256" }],
+		stateMutability: "view",
+	},
+	{
+		type: "function",
+		name: "_orders",
+		inputs: [
+			{ name: "", type: "bytes32", internalType: "bytes32" },
+			{ name: "", type: "address", internalType: "address" },
+		],
+		outputs: [{ name: "", type: "uint256", internalType: "uint256" }],
+		stateMutability: "view",
+	},
+	{
+		type: "function",
+		name: "_partialFills",
+		inputs: [
+			{ name: "", type: "bytes32", internalType: "bytes32" },
+			{ name: "", type: "bytes32", internalType: "bytes32" },
+		],
+		outputs: [{ name: "", type: "uint256", internalType: "uint256" }],
+		stateMutability: "view",
+	},
 	{
 		type: "function",
 		name: "calculateCommitmentSlotHash",
@@ -822,6 +870,35 @@ export const INTENT_GATEWAY_V2_ABI = [
 		],
 		anonymous: false,
 	},
+	{
+		type: "event",
+		name: "PartialFill",
+		inputs: [
+			{ name: "commitment", type: "bytes32", indexed: true, internalType: "bytes32" },
+			{ name: "filler", type: "address", indexed: false, internalType: "address" },
+			{
+				name: "outputs",
+				type: "tuple[]",
+				indexed: false,
+				internalType: "struct TokenInfo[]",
+				components: [
+					{ name: "token", type: "bytes32", internalType: "bytes32" },
+					{ name: "amount", type: "uint256", internalType: "uint256" },
+				],
+			},
+			{
+				name: "inputs",
+				type: "tuple[]",
+				indexed: false,
+				internalType: "struct TokenInfo[]",
+				components: [
+					{ name: "token", type: "bytes32", internalType: "bytes32" },
+					{ name: "amount", type: "uint256", internalType: "uint256" },
+				],
+			},
+		],
+		anonymous: false,
+	},
 	{ type: "error", name: "Cancelled", inputs: [] },
 	{ type: "error", name: "ECDSAInvalidSignature", inputs: [] },
 	{
@@ -840,6 +917,14 @@ export const INTENT_GATEWAY_V2_ABI = [
 	{ type: "error", name: "InvalidInput", inputs: [] },
 	{ type: "error", name: "InvalidShortString", inputs: [] },
 	{ type: "error", name: "NotExpired", inputs: [] },
+	{
+		type: "error",
+		name: "SafeCastOverflowedUintDowncast",
+		inputs: [
+			{ name: "bits", type: "uint8", internalType: "uint8" },
+			{ name: "value", type: "uint256", internalType: "uint256" },
+		],
+	},
 	{
 		type: "error",
 		name: "SafeERC20FailedOperation",

packages/filler-v2/src/config/interpolated-curve.ts

@@ -17,6 +17,23 @@ export interface CurveConfig {
 	points: CurvePoint[]
 }
 
+/**
+ * A coordinate point on a price curve
+ * @property amount - The input threshold (e.g., USD amount)
+ * @property priceUsd - The cNGN price in USD at this threshold
+ */
+export interface PriceCurvePoint {
+	amount: string
+	priceUsd: string
+}
+
+/**
+ * Configuration for a price curve
+ */
+export interface PriceCurveConfig {
+	points: PriceCurvePoint[]
+}
+
 interface ParsedPoint {
 	amount: number
 	value: number
@@ -129,3 +146,62 @@ export class FillerBpsPolicy {
 		return BigInt(this.curve.getValue(orderValueUsd))
 	}
 }
+
+/**
+ * Manages cNGN prices (in USD) based on order value.
+ * Uses piecewise linear interpolation between configured USD thresholds.
+ */
+export class FillerPricePolicy {
+	private points: { amount: Decimal; priceUsd: Decimal }[]
+
+	constructor(config: PriceCurveConfig) {
+		if (!config.points || config.points.length < 1) {
+			throw new Error("Filler price policy: must have at least 1 point to define a curve")
+		}
+
+		this.points = config.points
+			.map((p) => ({
+				amount: new Decimal(p.amount),
+				priceUsd: new Decimal(p.priceUsd),
+			}))
+			.sort((a, b) => a.amount.comparedTo(b.amount))
+
+		for (const point of this.points) {
+			if (!point.amount.isFinite() || point.amount.isNegative()) {
+				throw new Error("Filler price policy: invalid amount")
+			}
+			if (!point.priceUsd.isFinite() || !point.priceUsd.isPositive()) {
+				throw new Error("Filler price policy: price must be a positive number")
+			}
+		}
+	}
+
+	getPrice(orderValueUsd: Decimal): Decimal {
+		const amount = orderValueUsd
+
+		// Below minimum configured amount, use the first point
+		if (amount.lte(this.points[0].amount)) {
+			return this.points[0].priceUsd
+		}
+
+		// Above maximum configured amount, use the last point
+		const lastPoint = this.points[this.points.length - 1]
+		if (amount.gte(lastPoint.amount)) {
+			return lastPoint.priceUsd
+		}
+
+		// Piecewise linear interpolation between surrounding points
+		for (let i = 0; i < this.points.length - 1; i++) {
+			const p1 = this.points[i]
+			const p2 = this.points[i + 1]
+
+			if (amount.gte(p1.amount) && amount.lte(p2.amount)) {
+				const t = amount.minus(p1.amount).div(p2.amount.minus(p1.amount))
+				return p1.priceUsd.plus(t.mul(p2.priceUsd.minus(p1.priceUsd)))
+			}
+		}
+
+		// Fallback (should not be reached due to earlier checks)
+		return lastPoint.priceUsd
+	}
+}