@hyperlane-xyz/sdk 32.0.1 → 33.0.0

package/dist/predicate/PredicateApiClient.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PredicateApiClient.test.js","sourceRoot":"","sources":["../../src/predicate/PredicateApiClient.test.ts"],"names":[],"mappings":"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"}

package/dist/predicate/PredicateDeployer.d.ts

@@ -0,0 +1,56 @@
+import { PopulatedTransaction } from 'ethers';
+import { Logger } from 'pino';
+import { StaticAggregationHookFactory } from '@hyperlane-xyz/core';
+import { Address } from '@hyperlane-xyz/utils';
+import { MultiProvider } from '../providers/MultiProvider.js';
+import { TokenType } from '../token/config.js';
+import { PredicateWrapperConfig } from '../token/types.js';
+import { ChainName } from '../types.js';
+export interface PredicateWrapperDeploymentResult {
+    wrapperAddress: Address;
+    aggregationHookAddress: Address;
+    setHookTx: PopulatedTransaction;
+}
+export declare class PredicateWrapperDeployer {
+    private readonly multiProvider;
+    private readonly staticAggregationHookFactory;
+    private readonly logger;
+    constructor(multiProvider: MultiProvider, staticAggregationHookFactory: StaticAggregationHookFactory, logger?: Logger);
+    deployPredicateWrapper(chain: ChainName, warpRouteAddress: Address, config: PredicateWrapperConfig, tokenType?: TokenType): Promise<Address>;
+    createAggregationHook(chain: ChainName, predicateWrapperAddress: Address, existingHookAddress: Address): Promise<Address>;
+    /**
+     * Deploys the predicate wrapper and aggregation hook on-chain as a side effect, then
+     * returns the populated setHook transaction for the caller to include in its transaction
+     * array.
+     *
+     * IMPORTANT — irreversible side effects: deployPredicateWrapper submits a real on-chain
+     * transaction before this method returns. If the caller discards the returned setHookTx
+     * (dry-run, cancellation, error), the PredicateRouterWrapper is orphaned — deployed but
+     * unreferenced by any warp route. The aggregation hook is safe because
+     * StaticAggregationHookFactory uses CREATE2 (idempotent). Eliminating the wrapper orphan
+     * risk requires a CREATE2 factory for PredicateRouterWrapper (future contract work).
+     *
+     * This differs from EvmHookModule/EvmIsmModule: those modules own the full configuration
+     * lifecycle (deploy + configure in one atomic step). Here, deployment is eager but the
+     * final wiring (setHook) is deferred to EvmWarpModule.update(), which may choose not to
+     * submit it.
+     *
+     * @param existingHookOverride - When provided, skips the on-chain hook() read and uses
+     *   this address instead. Pass the pending new hook address when a hook update is being
+     *   applied in the same update() call to avoid wrapping a stale on-chain hook.
+     */
+    deployAndConfigure(chain: ChainName, warpRouteAddress: Address, config: PredicateWrapperConfig, tokenType?: TokenType, existingHookOverride?: Address): Promise<PredicateWrapperDeploymentResult>;
+    /**
+     * If hookAddress is a StaticAggregationHook that contains a predicate wrapper,
+     * strips it and (when multiple non-predicate sub-hooks remain) re-aggregates
+     * them via CREATE2 before returning, so the caller can safely wrap the result
+     * in a new aggregation without stacking wrappers.
+     *
+     * Falls back to hookAddress unchanged when:
+     * - The address is zero / not an aggregation hook
+     * - No predicate wrapper is found among sub-hooks
+     * - Multiple non-predicate sub-hooks remain (cannot safely re-aggregate here)
+     */
+    private stripPredicateAndReaggregateHook;
+}
+//# sourceMappingURL=PredicateDeployer.d.ts.map

package/dist/predicate/PredicateDeployer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"PredicateDeployer.d.ts","sourceRoot":"","sources":["../../src/predicate/PredicateDeployer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAa,MAAM,QAAQ,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAE9B,OAAO,EAML,4BAA4B,EAE7B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,OAAO,EAAc,MAAM,sBAAsB,CAAC;AAG3D,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,MAAM,WAAW,gCAAgC;IAC/C,cAAc,EAAE,OAAO,CAAC;IACxB,sBAAsB,EAAE,OAAO,CAAC;IAChC,SAAS,EAAE,oBAAoB,CAAC;CACjC;AAED,qBAAa,wBAAwB;IAIjC,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,4BAA4B;IAJ/C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;gBAGb,aAAa,EAAE,aAAa,EAC5B,4BAA4B,EAAE,4BAA4B,EAC3E,MAAM,CAAC,EAAE,MAAM;IAMX,sBAAsB,CAC1B,KAAK,EAAE,SAAS,EAChB,gBAAgB,EAAE,OAAO,EACzB,MAAM,EAAE,sBAAsB,EAC9B,SAAS,CAAC,EAAE,SAAS,GACpB,OAAO,CAAC,OAAO,CAAC;IA8Db,qBAAqB,CACzB,KAAK,EAAE,SAAS,EAChB,uBAAuB,EAAE,OAAO,EAChC,mBAAmB,EAAE,OAAO,GAC3B,OAAO,CAAC,OAAO,CAAC;IAkDnB;;;;;;;;;;;;;;;;;;;;OAoBG;IACG,kBAAkB,CACtB,KAAK,EAAE,SAAS,EAChB,gBAAgB,EAAE,OAAO,EACzB,MAAM,EAAE,sBAAsB,EAC9B,SAAS,CAAC,EAAE,SAAS,EACrB,oBAAoB,CAAC,EAAE,OAAO,GAC7B,OAAO,CAAC,gCAAgC,CAAC;IAoE5C;;;;;;;;;;OAUG;YACW,gCAAgC;CA+F/C"}

package/dist/predicate/PredicateDeployer.hardhat-test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=PredicateDeployer.hardhat-test.d.ts.map

package/dist/predicate/PredicateDeployer.hardhat-test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"PredicateDeployer.hardhat-test.d.ts","sourceRoot":"","sources":["../../src/predicate/PredicateDeployer.hardhat-test.ts"],"names":[],"mappings":""}

package/dist/predicate/PredicateDeployer.hardhat-test.js

@@ -0,0 +1,209 @@
+import { expect } from 'chai';
+import { constants } from 'ethers';
+import hre from 'hardhat';
+import { ERC20Test__factory, HypERC20Collateral__factory, MockPredicateRegistry__factory, PredicateRouterWrapper__factory, TokenRouter__factory, } from '@hyperlane-xyz/core';
+import { TestChainName } from '../consts/testChains.js';
+import { TestCoreDeployer } from '../core/TestCoreDeployer.js';
+import { HyperlaneProxyFactoryDeployer } from '../deploy/HyperlaneProxyFactoryDeployer.js';
+import { HyperlaneIsmFactory } from '../ism/HyperlaneIsmFactory.js';
+import { MultiProtocolProvider } from '../providers/MultiProtocolProvider.js';
+import { MultiProvider } from '../providers/MultiProvider.js';
+import { EvmHypCollateralAdapter } from '../token/adapters/EvmTokenAdapter.js';
+import { PredicateWrapperDeployer } from './PredicateDeployer.js';
+describe('PredicateWrapperDeployer', async () => {
+    const chain = TestChainName.test1;
+    const MOCK_POLICY_ID = 'x-test-policy-123';
+    let multiProvider;
+    let signer;
+    let signerAddress;
+    let factoryContracts;
+    let mailboxAddress;
+    let testTokenAddress;
+    let warpRouteAddress;
+    let mockPredicateRegistry;
+    before(async () => {
+        [signer] = await hre.ethers.getSigners();
+        signerAddress = await signer.getAddress();
+        multiProvider = MultiProvider.createTestMultiProvider({ signer });
+        const factoryDeployer = new HyperlaneProxyFactoryDeployer(multiProvider);
+        const contractsMap = await factoryDeployer.deploy(multiProvider.mapKnownChains(() => ({})));
+        factoryContracts = contractsMap[chain];
+        const legacyIsmFactory = new HyperlaneIsmFactory(contractsMap, multiProvider);
+        const testCoreDeployer = new TestCoreDeployer(multiProvider, legacyIsmFactory);
+        const { mailbox } = (await testCoreDeployer.deployApp()).getContracts(chain);
+        mailboxAddress = mailbox.address;
+        const testToken = await new ERC20Test__factory(signer).deploy('Test Token', 'TEST', '1000000000000000000000000', 18);
+        await testToken.deployed();
+        testTokenAddress = testToken.address;
+        mockPredicateRegistry = await new MockPredicateRegistry__factory(signer).deploy();
+        await mockPredicateRegistry.deployed();
+        const collateral = await new HypERC20Collateral__factory(signer).deploy(testTokenAddress, 1, 1, mailboxAddress);
+        await collateral.deployed();
+        await collateral.initialize(constants.AddressZero, constants.AddressZero, signerAddress);
+        warpRouteAddress = collateral.address;
+    });
+    describe('deployPredicateWrapper', () => {
+        it('should deploy PredicateRouterWrapper contract', async () => {
+            const deployer = new PredicateWrapperDeployer(multiProvider, factoryContracts.staticAggregationHookFactory);
+            const wrapperAddress = await deployer.deployPredicateWrapper(chain, warpRouteAddress, {
+                predicateRegistry: mockPredicateRegistry.address,
+                policyId: MOCK_POLICY_ID,
+                owner: signerAddress,
+            });
+            expect(wrapperAddress).to.be.properAddress;
+            const code = await multiProvider
+                .getProvider(chain)
+                .getCode(wrapperAddress);
+            expect(code).to.not.equal('0x');
+        });
+    });
+    describe('createAggregationHook', () => {
+        it('should create aggregation hook with two hooks', async () => {
+            const deployer = new PredicateWrapperDeployer(multiProvider, factoryContracts.staticAggregationHookFactory);
+            const wrapperAddress = await deployer.deployPredicateWrapper(chain, warpRouteAddress, {
+                predicateRegistry: mockPredicateRegistry.address,
+                policyId: MOCK_POLICY_ID,
+                owner: signerAddress,
+            });
+            const existingHookAddress = '0x1234567890123456789012345678901234567890';
+            const aggregationHookAddress = await deployer.createAggregationHook(chain, wrapperAddress, existingHookAddress);
+            expect(aggregationHookAddress).to.be.properAddress;
+            const code = await multiProvider
+                .getProvider(chain)
+                .getCode(aggregationHookAddress);
+            expect(code).to.not.equal('0x');
+        });
+    });
+    describe('deployAndConfigure', () => {
+        it('should deploy wrapper and aggregate with mailbox default hook when no existing hook', async () => {
+            const newCollateral = await new HypERC20Collateral__factory(signer).deploy(testTokenAddress, 1, 1, mailboxAddress);
+            await newCollateral.deployed();
+            await newCollateral.initialize(constants.AddressZero, constants.AddressZero, signerAddress);
+            const deployer = new PredicateWrapperDeployer(multiProvider, factoryContracts.staticAggregationHookFactory);
+            const result = await deployer.deployAndConfigure(chain, newCollateral.address, {
+                predicateRegistry: mockPredicateRegistry.address,
+                policyId: MOCK_POLICY_ID,
+                owner: signerAddress,
+            });
+            await signer.sendTransaction(result.setHookTx);
+            expect(result.wrapperAddress).to.be.properAddress;
+            expect(result.aggregationHookAddress).to.be.properAddress;
+            // Even with no existing hook, we aggregate with mailbox default hook for gas quoting
+            expect(result.wrapperAddress).to.not.equal(result.aggregationHookAddress);
+            const router = TokenRouter__factory.connect(newCollateral.address, signer);
+            const hookOnRouter = await router.hook();
+            expect(hookOnRouter).to.equal(result.aggregationHookAddress);
+        });
+        it('should create aggregation hook when existing hook is present', async () => {
+            const existingHook = await new ERC20Test__factory(signer).deploy('Dummy Hook', 'DH', '0', 18);
+            await existingHook.deployed();
+            const newCollateral = await new HypERC20Collateral__factory(signer).deploy(testTokenAddress, 1, 1, mailboxAddress);
+            await newCollateral.deployed();
+            await newCollateral.initialize(existingHook.address, constants.AddressZero, signerAddress);
+            const deployer = new PredicateWrapperDeployer(multiProvider, factoryContracts.staticAggregationHookFactory);
+            const result = await deployer.deployAndConfigure(chain, newCollateral.address, {
+                predicateRegistry: mockPredicateRegistry.address,
+                policyId: MOCK_POLICY_ID,
+                owner: signerAddress,
+            });
+            await signer.sendTransaction(result.setHookTx);
+            expect(result.wrapperAddress).to.not.equal(result.aggregationHookAddress);
+            const router = TokenRouter__factory.connect(newCollateral.address, signer);
+            const hookOnRouter = await router.hook();
+            expect(hookOnRouter).to.equal(result.aggregationHookAddress);
+        });
+    });
+    describe('Adapter Predicate Support', () => {
+        let wrapperAddress;
+        let collateralWithWrapper;
+        let multiProtocolProvider;
+        before(async () => {
+            multiProtocolProvider =
+                MultiProtocolProvider.fromMultiProvider(multiProvider);
+            collateralWithWrapper = await new HypERC20Collateral__factory(signer).deploy(testTokenAddress, 1, 1, mailboxAddress);
+            await collateralWithWrapper.deployed();
+            await collateralWithWrapper.initialize(constants.AddressZero, constants.AddressZero, signerAddress);
+            const deployer = new PredicateWrapperDeployer(multiProvider, factoryContracts.staticAggregationHookFactory);
+            const result = await deployer.deployAndConfigure(chain, collateralWithWrapper.address, {
+                predicateRegistry: mockPredicateRegistry.address,
+                policyId: MOCK_POLICY_ID,
+                owner: signerAddress,
+            });
+            await signer.sendTransaction(result.setHookTx);
+            wrapperAddress = result.wrapperAddress;
+        });
+        it('should detect PredicateRouterWrapper on collateral adapter', async () => {
+            const adapter = new EvmHypCollateralAdapter(chain, multiProtocolProvider, {
+                token: collateralWithWrapper.address,
+            });
+            const detectedWrapper = await adapter.getPredicateWrapperAddress();
+            expect(detectedWrapper).to.equal(wrapperAddress);
+        });
+        it('should return null when no PredicateRouterWrapper present', async () => {
+            const adapter = new EvmHypCollateralAdapter(chain, multiProtocolProvider, {
+                token: warpRouteAddress,
+            });
+            const detectedWrapper = await adapter.getPredicateWrapperAddress();
+            expect(detectedWrapper).to.be.null;
+        });
+        it('should route approval to wrapper when wrapper present', async () => {
+            const adapter = new EvmHypCollateralAdapter(chain, multiProtocolProvider, {
+                token: collateralWithWrapper.address,
+            });
+            const approveTx = await adapter.populateApproveTx({
+                weiAmountOrId: '1000000',
+                recipient: collateralWithWrapper.address,
+            });
+            expect(approveTx.to?.toLowerCase()).to.equal(testTokenAddress.toLowerCase());
+            expect(approveTx.data).to.include(wrapperAddress.slice(2).toLowerCase());
+        });
+        it('should throw error when attestation provided but no wrapper', async () => {
+            const adapter = new EvmHypCollateralAdapter(chain, multiProtocolProvider, {
+                token: warpRouteAddress,
+            });
+            const mockAttestation = {
+                uuid: 'test-uuid',
+                expiration: Math.floor(Date.now() / 1000) + 3600,
+                attester: signerAddress,
+                signature: '0x1234',
+            };
+            try {
+                await adapter.populateTransferRemoteTx({
+                    weiAmountOrId: '1000000',
+                    destination: 2,
+                    recipient: signerAddress,
+                    attestation: mockAttestation,
+                });
+                expect.fail('Expected error to be thrown');
+            }
+            catch (error) {
+                expect(error.message).to.include('Attestation provided but no PredicateRouterWrapper detected');
+            }
+        });
+        it('should populate transferRemoteWithAttestation when attestation provided', async () => {
+            const adapter = new EvmHypCollateralAdapter(chain, multiProtocolProvider, {
+                token: collateralWithWrapper.address,
+            });
+            const mockAttestation = {
+                uuid: 'test-uuid',
+                expiration: Math.floor(Date.now() / 1000) + 3600,
+                attester: signerAddress,
+                signature: '0x1234',
+            };
+            const tx = await adapter.populateTransferRemoteTx({
+                weiAmountOrId: '1000000',
+                destination: 2,
+                recipient: signerAddress,
+                attestation: mockAttestation,
+                interchainGas: {
+                    igpQuote: { amount: 0n },
+                },
+            });
+            expect(tx.to?.toLowerCase()).to.equal(wrapperAddress.toLowerCase());
+            const iface = PredicateRouterWrapper__factory.createInterface();
+            const selector = iface.getSighash('transferRemoteWithAttestation');
+            expect(tx.data?.startsWith(selector)).to.be.true;
+        });
+    });
+});
+//# sourceMappingURL=PredicateDeployer.hardhat-test.js.map

package/dist/predicate/PredicateDeployer.hardhat-test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PredicateDeployer.hardhat-test.js","sourceRoot":"","sources":["../../src/predicate/PredicateDeployer.hardhat-test.ts"],"names":[],"mappings":"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"}

package/dist/predicate/PredicateDeployer.js

@@ -0,0 +1,218 @@
+import { constants } from 'ethers';
+import { CrossCollateralRouter__factory, Mailbox__factory, PredicateCrossCollateralRouterWrapper__factory, PredicateRouterWrapper__factory, StaticAggregationHook__factory, TokenRouter__factory, } from '@hyperlane-xyz/core';
+import { rootLogger } from '@hyperlane-xyz/utils';
+import { OnchainHookType } from '../hook/types.js';
+import { TokenType } from '../token/config.js';
+export class PredicateWrapperDeployer {
+    multiProvider;
+    staticAggregationHookFactory;
+    logger;
+    constructor(multiProvider, staticAggregationHookFactory, logger) {
+        this.multiProvider = multiProvider;
+        this.staticAggregationHookFactory = staticAggregationHookFactory;
+        this.logger =
+            logger ?? rootLogger.child({ module: 'PredicateWrapperDeployer' });
+    }
+    async deployPredicateWrapper(chain, warpRouteAddress, config, tokenType) {
+        const signer = this.multiProvider.getSigner(chain);
+        const isCrossCollateral = tokenType === TokenType.crossCollateral;
+        const wrapperName = isCrossCollateral
+            ? 'PredicateCrossCollateralRouterWrapper'
+            : 'PredicateRouterWrapper';
+        this.logger.info({
+            chain,
+            warpRoute: warpRouteAddress,
+            registry: config.predicateRegistry,
+            tokenType,
+            wrapperType: wrapperName,
+        }, `Deploying ${wrapperName}`);
+        const overrides = this.multiProvider.getTransactionOverrides(chain);
+        // Deploy the appropriate wrapper based on token type
+        // Token address is fetched from warpRoute.token() in constructor
+        const wrapper = isCrossCollateral
+            ? await new PredicateCrossCollateralRouterWrapper__factory(signer).deploy(warpRouteAddress, config.predicateRegistry, config.policyId, overrides)
+            : await new PredicateRouterWrapper__factory(signer).deploy(warpRouteAddress, config.predicateRegistry, config.policyId, overrides);
+        await wrapper.deployed();
+        // Transfer wrapper ownership to the warp route owner so that admin functions
+        // (setPolicyID, setRegistry, withdrawETH) are controlled by the same key/multisig
+        // that owns the warp route, not the ephemeral deployer key.
+        // Use the explicit owner from config rather than reading from on-chain, because
+        // during initial deployment the on-chain owner is still the deployer signer
+        // (transferOwnership hasn't run yet).
+        const routeOwner = config.owner;
+        await this.multiProvider.handleTx(chain, wrapper.transferOwnership(routeOwner, overrides));
+        this.logger.info({
+            chain,
+            address: wrapper.address,
+            owner: routeOwner,
+            wrapperType: wrapperName,
+        }, `${wrapperName} deployed and ownership transferred`);
+        return wrapper.address;
+    }
+    async createAggregationHook(chain, predicateWrapperAddress, existingHookAddress) {
+        const signer = this.multiProvider.getSigner(chain);
+        this.logger.info({
+            chain,
+            predicateWrapper: predicateWrapperAddress,
+            existingHook: existingHookAddress,
+        }, 'Creating aggregation hook');
+        const hooks = [predicateWrapperAddress, existingHookAddress];
+        const threshold = hooks.length;
+        const factory = this.staticAggregationHookFactory.connect(signer);
+        const existingAddress = await factory['getAddress(address[],uint8)'](hooks, threshold);
+        const code = await this.multiProvider
+            .getProvider(chain)
+            .getCode(existingAddress);
+        let aggregationHookAddress;
+        if (code === '0x') {
+            const overrides = this.multiProvider.getTransactionOverrides(chain);
+            const tx = await factory['deploy(address[],uint8)'](hooks, threshold, overrides);
+            await this.multiProvider.handleTx(chain, tx);
+            aggregationHookAddress = existingAddress;
+        }
+        else {
+            this.logger.debug({ chain, address: existingAddress }, 'Recovered existing aggregation hook');
+            aggregationHookAddress = existingAddress;
+        }
+        this.logger.info({ chain, address: aggregationHookAddress }, 'Aggregation hook ready');
+        return aggregationHookAddress;
+    }
+    /**
+     * Deploys the predicate wrapper and aggregation hook on-chain as a side effect, then
+     * returns the populated setHook transaction for the caller to include in its transaction
+     * array.
+     *
+     * IMPORTANT — irreversible side effects: deployPredicateWrapper submits a real on-chain
+     * transaction before this method returns. If the caller discards the returned setHookTx
+     * (dry-run, cancellation, error), the PredicateRouterWrapper is orphaned — deployed but
+     * unreferenced by any warp route. The aggregation hook is safe because
+     * StaticAggregationHookFactory uses CREATE2 (idempotent). Eliminating the wrapper orphan
+     * risk requires a CREATE2 factory for PredicateRouterWrapper (future contract work).
+     *
+     * This differs from EvmHookModule/EvmIsmModule: those modules own the full configuration
+     * lifecycle (deploy + configure in one atomic step). Here, deployment is eager but the
+     * final wiring (setHook) is deferred to EvmWarpModule.update(), which may choose not to
+     * submit it.
+     *
+     * @param existingHookOverride - When provided, skips the on-chain hook() read and uses
+     *   this address instead. Pass the pending new hook address when a hook update is being
+     *   applied in the same update() call to avoid wrapping a stale on-chain hook.
+     */
+    async deployAndConfigure(chain, warpRouteAddress, config, tokenType, existingHookOverride) {
+        const signer = this.multiProvider.getSigner(chain);
+        // Connect to the appropriate router type
+        const isCrossCollateral = tokenType === TokenType.crossCollateral;
+        const warpRoute = isCrossCollateral
+            ? CrossCollateralRouter__factory.connect(warpRouteAddress, signer)
+            : TokenRouter__factory.connect(warpRouteAddress, signer);
+        // Use the override when provided (e.g. when a hook update is pending in the same
+        // update() call and the on-chain value would be stale).
+        const rawExistingHook = existingHookOverride ?? (await warpRoute.hook());
+        // If the existing hook is already an aggregation containing a predicate wrapper,
+        // unwrap it to the base (non-predicate) hook before re-aggregating. Without this,
+        // updating a predicate config would stack wrappers:
+        //   newAggregation([newWrapper, oldAggregation([oldWrapper, IGP])])
+        // instead of the correct:
+        //   newAggregation([newWrapper, IGP])
+        const existingHook = await this.stripPredicateAndReaggregateHook(chain, rawExistingHook);
+        // WARNING: deployPredicateWrapper submits a real on-chain transaction here.
+        // If the caller discards the returned setHookTx, this wrapper will be orphaned.
+        this.logger.warn({ chain, warpRoute: warpRouteAddress }, 'Deploying PredicateRouterWrapper — this on-chain deployment is irreversible. ' +
+            'Submit the returned setHookTx to complete wiring; discarding it will leave the wrapper orphaned.');
+        const wrapperAddress = await this.deployPredicateWrapper(chain, warpRouteAddress, config, tokenType);
+        let hookToAggregateWith;
+        if (existingHook !== constants.AddressZero) {
+            hookToAggregateWith = existingHook;
+        }
+        else {
+            const mailboxAddress = await warpRoute.mailbox();
+            const mailbox = Mailbox__factory.connect(mailboxAddress, signer);
+            hookToAggregateWith = await mailbox.defaultHook();
+            this.logger.info({ chain, defaultHook: hookToAggregateWith }, 'Using mailbox default hook for aggregation (warp route had no existing hook)');
+        }
+        const aggregationHookAddress = await this.createAggregationHook(chain, wrapperAddress, hookToAggregateWith);
+        const setHookTx = await warpRoute.populateTransaction.setHook(aggregationHookAddress);
+        return {
+            wrapperAddress,
+            aggregationHookAddress,
+            setHookTx,
+        };
+    }
+    /**
+     * If hookAddress is a StaticAggregationHook that contains a predicate wrapper,
+     * strips it and (when multiple non-predicate sub-hooks remain) re-aggregates
+     * them via CREATE2 before returning, so the caller can safely wrap the result
+     * in a new aggregation without stacking wrappers.
+     *
+     * Falls back to hookAddress unchanged when:
+     * - The address is zero / not an aggregation hook
+     * - No predicate wrapper is found among sub-hooks
+     * - Multiple non-predicate sub-hooks remain (cannot safely re-aggregate here)
+     */
+    async stripPredicateAndReaggregateHook(chain, hookAddress) {
+        if (!hookAddress || hookAddress === constants.AddressZero) {
+            return hookAddress;
+        }
+        const provider = this.multiProvider.getProvider(chain);
+        let subHooks;
+        try {
+            subHooks = await StaticAggregationHook__factory.connect(hookAddress, provider).hooks('0x');
+        }
+        catch {
+            // Any failure means hookAddress is not a StaticAggregationHook.
+            // SmartProvider wraps CALL_EXCEPTION as "Invalid response from provider" with code: undefined.
+            return hookAddress;
+        }
+        if (!subHooks || subHooks.length === 0)
+            return hookAddress;
+        const nonPredicateHooks = [];
+        for (const sub of subHooks) {
+            try {
+                const hookType = await PredicateRouterWrapper__factory.connect(sub, provider).hookType();
+                if (hookType === OnchainHookType.PREDICATE_ROUTER_WRAPPER) {
+                    this.logger.debug({ chain, predicateWrapper: sub }, 'Stripping existing predicate wrapper from aggregation to avoid stacking');
+                }
+                else {
+                    nonPredicateHooks.push(sub);
+                }
+            }
+            catch {
+                // hookType() failed — not a recognisable hook (or SmartProvider wrapped the
+                // revert as "Invalid response from provider" with code: undefined); keep it.
+                nonPredicateHooks.push(sub);
+            }
+        }
+        if (nonPredicateHooks.length === subHooks.length) {
+            // No predicate wrapper found — use hook as-is
+            return hookAddress;
+        }
+        if (nonPredicateHooks.length === 1) {
+            // Happy path: exactly one base hook remains
+            return nonPredicateHooks[0];
+        }
+        // Multiple non-predicate sub-hooks remain after removing the predicate wrapper.
+        // Re-aggregate them via CREATE2 (idempotent) so the caller produces:
+        //   outerAgg([newWrapper, innerAgg([hookA, hookB])])
+        // instead of the stacking anti-pattern:
+        //   newAgg([newWrapper, oldAgg([oldWrapper, hookA, hookB])])
+        this.logger.debug({ chain, nonPredicateHooks }, 'Multiple non-predicate sub-hooks found — re-aggregating without predicate wrapper');
+        const signer = this.multiProvider.getSigner(chain);
+        const overrides = this.multiProvider.getTransactionOverrides(chain);
+        const factory = this.staticAggregationHookFactory.connect(signer);
+        const threshold = nonPredicateHooks.length;
+        const innerAggAddress = await factory['getAddress(address[],uint8)'](nonPredicateHooks, threshold);
+        const code = await this.multiProvider
+            .getProvider(chain)
+            .getCode(innerAggAddress);
+        if (code === '0x') {
+            const tx = await factory['deploy(address[],uint8)'](nonPredicateHooks, threshold, overrides);
+            await this.multiProvider.handleTx(chain, tx);
+            this.logger.info({ chain, innerAgg: innerAggAddress, hooks: nonPredicateHooks }, 'Inner aggregation hook deployed for predicate-stripped sub-hooks');
+        }
+        else {
+            this.logger.debug({ chain, innerAgg: innerAggAddress }, 'Recovered existing inner aggregation hook');
+        }
+        return innerAggAddress;
+    }
+}
+//# sourceMappingURL=PredicateDeployer.js.map

package/dist/predicate/PredicateDeployer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PredicateDeployer.js","sourceRoot":"","sources":["../../src/predicate/PredicateDeployer.ts"],"names":[],"mappings":"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"}