hyperlane-monorepo

Commit Graph

Author	SHA1	Message	Date
Yorke Rhodes	836060240b	feat: mutable storage ISMs (#4577 ) ### Description Some chains like zkSync do not support eip1167 (minimal/meta) proxies. This PR adds an alternative storage based multisig and aggregation ISM for use on these chains. ### Drive-by changes Simplify CLI multisig interactive config builder. Remove stale multisig config. ### Related issues None ### Backward compatibility Yes, relayer already supports this module type ### Testing Contract unit tests Manual CLI tests ![Screenshot 2024-10-02 at 4 05 08 PM](https://github.com/user-attachments/assets/c7fec896-ea7c-4fd9-a313-463168e66a82)	3 weeks ago
Kunal Arora	f26453ee55	fix(contracts): add `msg.Value` to `verifyMessageId` (#4541 ) ### Description - Added to the msg.value to verifyMessageId to test if the msgValue passed in is the same as the msgValue used postDispatch ### Drive-by changes - None ### Related issues - fixes https://github.com/chainlight-io/2024-08-hyperlane/issues/3 ### Backward compatibility Yes ### Testing Unit tests	4 weeks ago
Kunal Arora	469f2f3403	fix(contracts): quote management for L2->L1 hooks (#4552 ) ### Description - check for sufficient fees in `AbstractMessageIdAuthHook` and refund surplus - add a child hook to OPL2ToL1Hook and ArbL2ToL1Hook to use the igp to pay for the destination gas fees ~~Note: LayerzeroL2Hook currently also refunds from msg.value, will make it into issue to be fixed later as we're using the layerzero hooks right now.~~ ### Drive-by changes - None ### Related issues - fixes https://github.com/chainlight-io/2024-08-hyperlane/issues/10 ### Backward compatibility No ### Testing Fuzz	4 weeks ago
Kunal Arora	c55257cf5f	fix(contracts): minor token related changes (#4580 ) ### Description Minor token related changes like adding custom hook to 4626 collateral, checking for ERC20 as valid contract in HypERC20Collateral, etc. ### Drive-by changes check for overflow in bytes32ToAddress ### Related issues - partly fixes https://github.com/chainlight-io/2024-08-hyperlane/issues/14 ### Backward compatibility Yes ### Testing Unit tests	1 month ago
Kunal Arora	3e1ab75643	fix(contracts): add check for valid mailbox and relayer in `TrustedRelayerIsm` (#4553 ) ### Description - minor fix: add an isContract check for mailbox and non-zero check for relayer when instantiating TrustedRelayerIsm ### Drive-by changes None ### Related issues - partly fixes https://github.com/chainlight-io/2024-08-hyperlane/issues/14 ### Backward compatibility Yes ### Testing Unit	1 month ago
Kunal Arora	2760da1ded	fix: ensure no duplicate signatures verified for `AbstractWeightedMultisigIsm.verify()` (#4468 ) ### Description - There's a bug in the verify function of `AbstractWeightedMultisigIsm` that an attacker might use to bypass the verification of multiple signatures. The code tried to check the duplication of the signers if not found, but the code does not increment validatorIndex when the recovered signer matches to the stored signer. For instance: - validatorsAndThresholdWeight returns [A, B, C, D] - an attacker uses signatures as [sig from A, sig from A, sig from A, sig from A, ...] or [sig from B, sig from B, …] Fix is to add a ++validatorIndex at the end of the for loop implies we don't allow the next signer to be the same as the signer we just verified. ### Drive-by changes None ### Related issues From Chainlight's audit findings ### Backward compatibility We haven't deployed these contracts yet on testnet/mainnet ### Testing Fuzz testing	1 month ago
Kunal Arora	c9085afd96	fix: add fix for checking for correct messageId in `OPL2ToL1Ism` and `ArbL2ToL1Ism` via external call (#4437 ) ### Description - In agreement with Chainlight team's recommendation, added a second isVerified() check after portal call to make sure an arbitrary call which passes the check for metadata length and messageId cannot be verified without calling is verifyMessageId(messageId) in `OPL2ToL1Ism` and `ArbL2ToL1` ### Drive-by changes None ### Related issues - fixes https://github.com/chainlight-io/2024-08-hyperlane/issues/2 ### Backward compatibility No, but the contracts aren't deployed anywhere ### Testing Unit testing	1 month ago
Yorke Rhodes	bb75eba74a	fix: recipient rate limited ISM (#4636 ) ### Description Add recipient restriction to rate limited ISM. This prevents multiple recipients from sharing the same rate limit ISM and denial of service attacks. ### Backward compatibility No ### Testing Unit Tests	2 months ago
Kunal Arora	c032b8ba27	chore: refactor MessagIdHook/ISM tests into a common `ExternalBridgeTest` contract (#4490 ) ### Description We currently have 6 different versions of ISMs derived from AbstractMessageIdAuthorizedIsm: - OPL2ToL1 - ArbL2ToL1 - OPStack (L1->L2) - ERC5164 - LayerZero - PolygonPOS But all of them have their own custom test suite right now, with widely overlapping testing areas. For standardizing the tests, I've created a base test contract `ExternalBridgeTest` that handles the common tests. This has a few benefits: - harder to miss tests for known pitfalls like msg.value or asynchronicity assumption for verifyMessageId - less code duplication with each additional Ism I have moved OPL2ToL1, ArbL2ToL1, OPStack, and ERC5164 to the new base test, and I'll forgo the rest for now because of the time sensitivity of audit remediations. I've created an issue tracking the remaining work here: https://github.com/hyperlane-xyz/issues/issues/1384 ### Drive-by changes None ### Related issues Related to https://github.com/chainlight-io/2024-08-hyperlane/issues/3 ### Backward compatibility Yes ### Testing Unit	2 months ago
Kunal Arora	445b6222c0	fix: `ArbL2ToL1Ism` will support msg.value (#4328 ) ### Description - Added support for msg.value by rearranging the `releaseValueToRecipient()` in the verify call ### Drive-by changes - uncommented out `test_postDispatch_revertWhen_notLastDispatchedMessage` test ### Related issues <!-- - Fixes #[issue number here] --> ### Backward compatibility <!-- Are these changes backward compatible? Are there any infrastructure implications, e.g. changes that would prohibit deploying older commits using this infra tooling? Yes/No --> ### Testing Unit tests	3 months ago
Kunal Arora	6f377f1743	feat: implement `OPL2ToL1Ism` contracts (#4319 ) ### Description Implementing the `OPL2ToL1Hook` and OPL2ToL1Ism` contracts for using the Optimism native bridge for sending messages from the L2 to L1. - Optimism needs double call encoding for the direct portal call because the portal itself calls the l1Messenger which then directs it to the ism. ### Drive-by changes None ### Related issues - fixes https://github.com/hyperlane-xyz/issues/issues/1346 ### Backward compatibility Yes ### Testing Unit testing with mocks for OP contracts	3 months ago
Kunal Arora	e151b5f9ac	feat: support Arbitrum L2->L1 message using CLI self-relay option (#3986 ) ### Description - trying for null metadata (in case where the L2->L1 call has been executed by a third party) otherwise waiting for the challenge period and then fetching the outbox proof using the `ArbL2ToL1MetadataBuilder` - deriving ArbL2ToL1 hook and ism - deriving custom hook from reciptISM when ismType == ARB_L2_TO_L1 ### Drive-by changes - modifying status command in CLI to write context for self-relaying messages ### Related issues - fixes https://github.com/hyperlane-xyz/issues/issues/1290 ### Backward compatibility Yes ### Testing Testnet from arbitrumsepolia -> sepolia - l2->l1 tx using selfrelay (if already preverified by 3rd party relayer) https://sepolia.etherscan.io/tx/0xa6af2355facedb102e1fb7275249ab714dadacd4264daa170801469cf22f2bc0 - l2->l1 tx using direct executeTransaction call https://sepolia.etherscan.io/tx/0x42bb0eefcbd0f78b5048052c911746d13da15a9fb9659775d5d9df1e116a2a3d --------- Co-authored-by: Yorke Rhodes <yorke@hyperlane.xyz> Co-authored-by: Yorke Rhodes <email@yorke.dev>	4 months ago
Kunal Arora	d396e2c553	feat: add `IStaticWeightedIsm` implementation (#4170 ) ### Description - Adding the static variation of the IWeightedIsm config where you configure validators with their corresponding weights and store it as bytecode. ### Drive-by changes None ### Related issues - fixes https://github.com/hyperlane-xyz/hyperlane-monorepo/issues/4160 ### Backward compatibility Yes ### Testing Fuzz tests	4 months ago
Kunal Arora	90598ad449	feat: remove outbox param from `ArbL2ToL1Ism` (#4178 ) ### Description - outbox contract can be derived from arbitrum's bridge contract so it's not useful to pass in ### Drive-by changes None ### Related issues None ### Backward compatibility Yes ### Testing Unit	4 months ago
Kunal Arora	f733379488	feat: support Arbitrum L2->L1 post dispatch hook (#3853 ) ### Description - Contract support for the enabling postDispatch hook with the Arbitrum nitro bridge from L2 to L1 - asynchronously via executeTransaction call to verifyMessageId first and then the relayer calling the verify message with no metadata (note: this supports msg.value) - synchronously via a single verify call which in turn calls executeTransaction on outbox to gets the message verified in the verifyMessageId (note: this doesn't support msg.value as ism.verify isn't payable) - Added a script for deploying the hook and ISM since the sdk doesn't support it yet. ### Drive-by changes - changing the type from "rate_limited_hook" to "RATE_LIMITED" to maintain consistency ### Related issues - fixes https://github.com/hyperlane-xyz/hyperlane-monorepo/issues/2846 ### Backward compatibility Yes ### Testing Unit and e2e with arbitrumsepolia->sepolia	5 months ago
Yorke Rhodes	69de68a66e	Multisig and Aggregation ISM Metadata Encoding (#3701 ) ### Description - Implement multisig metadata encoding/decoding - Implement aggregation metadata encoding/decoding - Generates test metadata fixtures from solidity unit tests - Test encoders using fixtures ### Drive By - Make CI tests run topologically ### Related issues - Fixes https://github.com/hyperlane-xyz/hyperlane-monorepo/issues/3449 - Fixes https://github.com/hyperlane-xyz/hyperlane-monorepo/issues/3451 ### Backward compatibility Yes ### Testing Unit Tests	7 months ago
Paul-T.C-Yu	c9c5d37bab	add polygon hook and ism (#3038 ) ### Description - Add native polygon bridge hook and isms ### Related issues - Fixes #2847 - Documented with https://github.com/hyperlane-xyz/v3-docs/pull/31 ### Backward compatibility Yes ### Testing Unit Tests --------- Co-authored-by: NOOMA-42 <suncloud2203357667@gmail.com>	7 months ago
Yorke Rhodes	c7007b0561	Implement trusted relayer ISM (#3363 ) ### Description - Adds an ISM that verifies whether the configured trusted relayer is the relayer of the message ### Related issues - Touches https://github.com/hyperlane-xyz/hyperlane-monorepo/issues/3371 ### Testing Unit Tests	7 months ago
Lee	24e1f86d25	Warp Route rate limiter hook & ISM (#3527 ) ### Description Adds rate limiting hook and ism to limit warp route transfers ### Drive-by changes <!-- Are there any minor or drive-by changes also included? --> ### Related issues - Fixes #2697 ### Backward compatibility Yes ### Testing Unit Tests --------- Signed-off-by: Paul Balaji <paul@hyperlane.xyz> Co-authored-by: Noah Bayindirli 🥂 <noah@primeprotocol.xyz> Co-authored-by: Kunal Arora <55632507+aroralanuk@users.noreply.github.com> Co-authored-by: Paul Balaji <paul@hyperlane.xyz> Co-authored-by: J M Rossy <jm.rossy@gmail.com> Co-authored-by: Trevor Porter <trkporter@ucdavis.edu> Co-authored-by: Daniel Savu <23065004+daniel-savu@users.noreply.github.com>	8 months ago
J M Rossy	adab1bec0c	Add code spellcheck CI job (#3467 ) ### Description Fix spelling mistakes and create codespell CI job. An extension of #3422 with the remaining mistakes fixed ### Backward compatibility Yes --------- Co-authored-by: miles <66052478+miles-six@users.noreply.github.com> Co-authored-by: Paul Balaji <paul@hyperlane.xyz>	8 months ago
Lee	ae0990a0b3	LayerZero Hook and ISM (#3102 ) ### Description - Implements LayerZero V1 and V2 hook with V2 ISM. - V2 ISM is backwards compatible i.e., V1 hook (which uses V1 endpoint to send) can send to V2 ISM (which uses V2 endpoint to receive). See [here](https://docs.layerzero.network/explore/migration#configuring-ultralightnode301) for configuration. - V2 uses `AbstractsMessageIdAuthorized*`. In. other words, hook passes messageId through LayerZero, which stores into ISM to be used when relayer calls `verify()` . - Includes unit test for both V1 and V2 hook and ISM. - V1 uses official LayerZero endpoint mock. ### Drive-by changes <!-- Are there any minor or drive-by changes also included? --> ### Related issues - Implements #2853 ### Backward compatibility Yes ### Testing Manual/Unit Tests	9 months ago
Lee	b379336b91	Yield-earning Warp Routes with ERC4626 (#3076 ) ### Description Integrates ERC4626 compatible vaults. This PR assumes that the vault `asset` is the same as `wrappedToken` - `_transferFromSender()` deposits into the vault - `_transferTo()` withdraws from the vault - `sweep()` redeems excess shares for the vault asset - Uses internal `assetDeposited` store to keep track of assets deposited. Used to calculate excess shares to be withdrawn by owner - Makes minor changes to existing test files to allow new tests to inherit ### Drive-by changes <!-- Are there any minor or drive-by changes also included? --> ### Related issues - Implements #2450 ### Backward compatibility Yes ### Testing Manual/Unit Tests --------- Co-authored-by: Yorke Rhodes <email@yorke.dev>	9 months ago
Yorke Rhodes	0727a6178e	Pausable ISM (#3141 ) ### Description - Adds pausable hook and ism config support to deployers - Configure testnet pausable hook and ISM - Add pausable ism checking ### Drive-by changes - Refactors ownable config ### Related issues - https://github.com/hyperlane-xyz/issues/issues/706 ### Backward compatibility - Yes ### Testing - Unit Tests and fork tests	10 months ago
Kunal Arora	9561931571	fix: failing ci tests for `SmartProvider` and `OpStackIsm.t.sol` (#3148 ) ### Description - Problem: OpStackIsm.t.sol was failing because of very stale block number for fork Fix: Excluding foundry fork testing from CI and updating block number - Problem: SmartProvider getLogs tests failing because the the results end up being an empty list and getConfirmations results a smaller number of confirmations than expected (712 vs 1705184) fix: excluded from ci ### Drive-by changes None ### Related issues None ### Backward compatibility Yes ### Testing Manual	11 months ago
Trevor Porter	1a64cef37e	Refactor key management in infra and key funder (#3023 ) ### Description * Remove the `bank` role, which we haven't used since the inception of abacus / hyperlane * Big changes to `key-utils.ts` so that there's a single source of truth on what kind of keys are used depending on the role & chain. Before this was sprinkled in a few different places * You can now get an object of `{ [chain]: { [role]: keys[] } }`, so it's super clear what kind of key relates to which chain. For example, before we would use the AWS-based relayer key for EVM chains, and then a GCP-based relayer key for non-EVM chains. But this wasn't really honored by key funder - it had no way of knowing to only fund the AWS relayer on EVM chains, and only fund the GCP relayer on non-EVM chains. Same situation for Kathy, where we want to use AWS keys for EVM chains but the GCP key for non-EVM chains * On v2 and prior to that we were using the AWS-based key for Kathy. Originally, we also launched v3 this way. However it was changed on v3 to use the GCP key for Kathy, causing us to fund both types of addresses on v3. This makes it more clear that we should be using the AWS-based key for Kathy on EVM chains ### Drive-by changes <!-- Are there any minor or drive-by changes also included? --> ### Related issues <!-- - Fixes #[issue number here] --> ### Backward compatibility <!-- Are these changes backward compatible? Are there any infrastructure implications, e.g. changes that would prohibit deploying older commits using this infra tooling? Yes/No --> ### Testing <!-- What kind of testing have these changes undergone? None/Manual/Unit Tests -->	12 months ago
Kunal Arora	e06fe0b327	fix:enable `DefaultFallbackRoutingIsm` through non-factory deployment (#3009 ) ### Description - `DefaultFallbackRoutingIsm` needs the mailbox address which meant `DefaultFallbackRoutingIsmFactory` needed the mailbox address which is not ideal. So, I switched to non-factory deployments for this specific ISM type. - CLI does the ISM deployment inside core deployment instead of ISM first and core then. - Using the coreDeployer's `cachedAddresses` to store the latest ie toplevel ISM. ### Drive-by changes - fixed bug in `ismFactory.fromAddressMap` to not use the multiprovider filtered by contract map. This is undesirable as CLI user can provide chain selection and artifacts which doesn't include all the chains in the configs (and when we call `multiprovider.getDomainId` for the origin which may now be missing from the filtered MP, we get an error). ### Related issues - fixes https://github.com/hyperlane-xyz/hyperlane-monorepo/issues/2895 ### Backward compatibility Yes ### Testing Manual through CLI	12 months ago
Yorke Rhodes	1a584ad8a4	Improve standard hook metadata API	1 year ago
Yorke Rhodes	b14f997810	Graduate to yarn 4 🧶 (#2899 ) Co-authored-by: J M Rossy <jm.rossy@gmail.com> Fixes https://github.com/hyperlane-xyz/issues/issues/687 Fixes #2228 Fixes https://github.com/hyperlane-xyz/issues/issues/704	1 year ago
Kunal Arora	e90ae5a0d3	Remediate Trevor's comments (#2835 ) Co-authored-by: Yorke Rhodes <yorke@hyperlane.xyz>	1 year ago
Yorke Rhodes	49fc06e65e	Support hook rotation in core deployer (#2834 )	1 year ago
Yorke Rhodes	8e4f2bbe18	Make immutable implementation of factories public (#2761 ) Fixes https://github.com/hyperlane-xyz/hyperlane-monorepo/issues/2759	1 year ago
Yorke Rhodes	c91f589e4e	Add unenroll to Router (#2760 ) Fixes https://github.com/hyperlane-xyz/issues/issues/630	1 year ago
Yorke Rhodes	1ecfc46ce2	v3 Router SDK changes (#2752 ) ### Description - Reorganize solidity directory structure for clarity - Updates router apps (token and helloworld) with changes from https://github.com/hyperlane-xyz/hyperlane-monorepo/pull/2749 ### Drive-by changes - Merges the hyperlane-token package to solidity and sdk ### Backward compatibility No (removed token package) ### Testing - Unit Tests - Instrumented coverage	1 year ago
Yorke Rhodes	fcfecdf250	Update router implementations for v3 (#2749 )	1 year ago
Kunal Arora	03c92e1e34	Minor internal review remediation 1 (#2748 )	1 year ago
Kunal Arora	f783c4e96f	add globalHookMetadata (#2743 ) ### Description - Consolidating IGPMetadata and OPStackMetadata to versioned GlobalHookMetadata - Add `supportMetadata` to `IPostDispatchHook` - Metadata Schema [0:1] variant [2:33] msg.value [34:65] Gas limit for message (IGP) [66:85] Refund address for message (IGP) [86:] Custom metadata ### Drive-by changes None ### Related issues - fixes https://github.com/hyperlane-xyz/issues/issues/610 ### Backward compatibility No ### Testing Unit tests --------- Co-authored-by: Yorke Rhodes <yorke@hyperlane.xyz>	1 year ago
Kunal Arora	43ba1b46f1	Running forge with latest solc (#2729 ) ### Description - Removed contracts-bedrock contracts dependency from eth-optimism (which was forcing us to use 0.8.15) - Added local minimal interfaces for the CrossDomainMessenger contract ### Drive-by changes None ### Related issues None ### Backward compatibility Yes ### Testing Unit tests --------- Signed-off-by: -f <kunalarora1729@gmail.com> Co-authored-by: Yorke Rhodes <yorke@hyperlane.xyz>	1 year ago
Yorke Rhodes	af88ae66c3	Fix rebase	1 year ago
Yorke Rhodes	f7dbc71335	Update multisig ISMs for merkle hooks (#2722 ) Fixes https://github.com/hyperlane-xyz/issues/issues/591	1 year ago
Yorke Rhodes	7309f770ef	Add forge test for Mailbox (#2713 )	1 year ago
Kunal Arora	2b7ecfc312	Add `quoteDispatch` to `IPostDispatchHook` (#2660 ) - `quoteDispatch` added to `IPostDispatchHook` interface and the relevant hooks: - StaticProtocolFee - OPStackHook - InterchainGasPaymaster - MerkleTreeHook - PausableHook (no tests) - DomainRoutingHook (no tests) - ConfigFallbackDomainRoutingHook - ConfigurableDomainRoutingHook (no tests) - `expectEmit` -> `expectCall` - Quote in V3 Yes Uint tests	1 year ago
Kunal Arora	6a32287f00	Fix forge tests post V3 (#2661 ) - fixes GasRouter expectRevert message - added TestMerkleRootHook for proof() and fixes MerkleRootMultisig test - fixes ERC5164 tests post v3 changes - added contract name to mailbox and abstractHook error messages - removed unnecessary tests for "message too large" - downgrade slither in actions to 0.3.0 because of their recent "missing inheritance" bug on main - V3 Yes Unit tests	1 year ago
Kunal Arora	760dce657b	Converting the OP stack hooks to transient storage version (#2632 ) - Updated the OP Stack tests for the Mailbox V3 transient storage version - Allowing OPStackHook to send msg.value at the time of message delivery (uses bit masking) - Added LibBit library, will be useful for all the auth hooks which can send `msg.value` - None - Fixes breaking OP Stack tests for https://github.com/hyperlane-xyz/issues/issues/513 - Also fixes https://github.com/hyperlane-xyz/hyperlane-monorepo/issues/2410 No Unit tests --------- Co-authored-by: Yorke Rhodes <yorke@hyperlane.xyz> Remove e2e and add yarn build to CI Adding protocol fees (#2640) - Adding protocol fee as a hook - None V3 Yes Fuzz tests --------- Co-authored-by: Yorke Rhodes <yorke@hyperlane.xyz>	1 year ago
Kunal Arora	0e10306d4b	Adding Optimism Hook and dispatch with metadata (#2580 ) Use mailbox callback to authenticate messages in hooks where necessary (#2609) Co-authored-by: Kunal Arora <55632507+aroralanuk@users.noreply.github.com>	1 year ago
Yorke Rhodes	ff2a495389	Add pausable ism (#2675 )	1 year ago
Yorke Rhodes	e582357de8	Make Domain Routing ISM enumerable (#2644 )	1 year ago
J M Rossy	465112db6f	Refactor utils package (#2550 ) ### Description - Reorganize code into separate files - Move in utils from other packages - Fix export structure - Add multi-protocol address utils ### Drive-by changes Lint fix in token package ### Related issues Pre-req for #2503 ### Backward compatibility No, some exports have been removed from the SDK and moved to utils	1 year ago
Yorke Rhodes	aa92fe37db	Fix crosschaincall duplicate warning (#2532 ) ### Description Fixes ``` duplicate definition - NotCrossChainCall() ```	1 year ago
Kunal Arora	7918a320c9	reset to mapping of mapping of messageiD and adding crosschain (#2506 ) ### Description - Reverting to using `mapping(bytes32 => mapping(bytes32 => bool)) public verifiedMessageIds` to prevent a malicious party from changing sender addresses in the ISM and causing liveness failiure for the honest party. - Adding `CrossChainEnabledOptimism` libraries and contracts locally instead of importing from OpenZeppelin's library (removed) - Renaming `AbstractNativeISM` to `AbstractHookISM` for flexibility and clarity. ### Drive-by changes Nope ### Related issues Fixes #2497 ### Backward compatibility Backward compatible? Yes Any infrastructure implications? No ### Testing Unit Tests	1 year ago
Kunal Arora	7c872bc449	5164 hook support (#2471 ) ### Description - Adding support for any ERC-5164 compatible bridge adapter to be added as a hook. See https://eips.ethereum.org/EIPS/eip-5164 for more details on the EIP and https://github.com/MultiMessageAggregation/multibridge for adapter implementations for different vendors. ### Drive-by changes - Switched mapping(bytes32 => mapping(address => true) to mapping(bytes32 => bytes) for verifedMessageIds because the last boolean is redundant in the AbtrsactNativeISM contract. ### Related issues - Fixes #2417 ### Backward compatibility _Are these changes backward compatible?_ Yes _Are there any infrastructure implications, e.g. changes that would prohibit deploying older commits using this infra tooling?_ None ### Testing _What kind of testing have these changes undergone?_ Unit Tests	1 year ago

1 2

64 Commits (3ce70725ee62069272f6de51987fbc8a4b1ee7d6)