Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions packages/agents/sdk/src/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,8 @@ export const domainsToChainNames: Record<string, string> = {
"1935897199": "scroll",
"1936027759": "sepolia",
"1869640549": "optimism-sepolia",
"1633842021": "arbitrum-sepolia"
"1633842021": "arbitrum-sepolia",
"1718772088": "fraxtal",
};

// Need to add more domains here.
Expand All @@ -216,7 +217,8 @@ export const XERC20REGISTRY_DOMAIN_ADDRESS: Record<string, string> = {
"1935897199": "0x397aEEEDd44f40326f9eB583a1DFB8A7A673C40B", // scroll
"1936027759": "0x2a3fe9a49fb50536f1ed099192c2ae2404de7bb5", // sepolia
"1869640549": "0x18b5b08b10a2e351180f07e31f4fef94d14e28f6", // op-sepolia
"1633842021": "0x343d827d5109e8038bbb71e9ba4f3fd0d546b9ff" // arb-sepolia
"1633842021": "0x343d827d5109e8038bbb71e9ba4f3fd0d546b9ff", // arb-sepolia
"1718772088": "", // fraxtal
};

// Need to add more domains here.
Expand All @@ -234,5 +236,6 @@ export const LOCKBOX_ADAPTER_DOMAIN_ADDRESS: Record<string, string> = {
"1935897199": "", // scroll (TODO)
"1936027759": "0xcF021fCFB9bd72E5aA7ab390cFA4fCfDF895c7Cf", // sepolia
"1869640549": "0x20b4789065DE09c71848b9A4FcAABB2c10006FA2", // op-sepolia
"1633842021": "0x0f4Fe4903d01E0deb067A7297453fBEFdC36D189" // arb-sepolia
"1633842021": "0x0f4Fe4903d01E0deb067A7297453fBEFdC36D189", // arb-sepolia
"1718772088": "", // fraxtal
};
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,6 @@ contract BridgeFacet is BaseConnextFacet {
* @param _transferId - The unique identifier of the crosschain transaction
*/
function bumpTransfer(bytes32 _transferId) external payable nonReentrant whenNotPaused {
if (msg.value == 0) revert BridgeFacet__bumpTransfer_valueIsZero();
_bumpTransfer(_transferId, address(0), msg.value);
}

Expand Down Expand Up @@ -720,6 +719,7 @@ contract BridgeFacet is BaseConnextFacet {
address relayerVault = s.relayerFeeVault;
if (relayerVault == address(0)) revert BridgeFacet__bumpTransfer_noRelayerVault();
if (_relayerFeeAsset == address(0)) {
if (msg.value == 0) revert BridgeFacet__bumpTransfer_valueIsZero();
Address.sendValue(payable(relayerVault), _relayerFee);
} else {
// Pull funds from user to this contract
Expand Down
9 changes: 0 additions & 9 deletions packages/deployments/contracts/deploy/01_deployMessaging.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,8 @@ const formatConnectorArgs = (
watcherManager,
} = args;
const config = protocol.configs[connectorChainId];
console.log(`using config`, config);

const isHub = deploymentChainId === protocol.hub.chain && connectorChainId != protocol.hub.chain;

const deploymentDomain = chainIdToDomain(deploymentChainId).toString();
const mirrorDomain = chainIdToDomain(mirrorChainId).toString();

Expand Down Expand Up @@ -166,13 +164,6 @@ const handleDeployHub = async (
});
console.log(`${connectorName} deployed to ${deployment.address}`);

// setArborist for Spoke to Merkle
const merkleForSpokeContract = await hre.ethers.getContractAt(
"MerkleTreeManager",
merkleTreeManagerForSpoke.address,
deployer,
);

/// HUBCONNECTOR DEPLOYMENT
// Loop through every HubConnector configuration (except for the actual hub's) and deploy.
const { configs } = protocol;
Expand Down
29 changes: 29 additions & 0 deletions packages/deployments/contracts/deployConfig/shared.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ const BLOCKS_PER_MINUTE: Record<number, number> = {
84531: 30, // base-goerli
195: 60, // x1-testnet
534351: 14, // scroll sepolia l2
252: 30, // Fraxtal
};

const THIRTY_MINUTES_IN_BLOCKS = Object.fromEntries(
Expand Down Expand Up @@ -770,6 +771,34 @@ export const MESSAGING_PROTOCOL_CONFIGS: Record<string, MessagingProtocolConfig>
},
},
},
252: {
prefix: "Optimism",
networkName: "Fraxtal",
ambs: {
// L1CrossDomainMessenger
// https://docs.frax.com/fraxtal/addresses/fraxtal-contracts#ethereum-mainnet
hub: "0x126bcc31Bc076B3d515f60FBC81FddE0B0d542Ed",
// L2CrossDomainMessenger
spoke: "0x4200000000000000000000000000000000000007",
},
processGas: DEFAULT_PROCESS_GAS,
reserveGas: DEFAULT_RESERVE_GAS,
delayBlocks: THIRTY_MINUTES_IN_BLOCKS[252],
disputeBlocks: THIRTY_MINUTES_IN_BLOCKS[252],
minDisputeBlocks: THIRTY_MINUTES_IN_BLOCKS[252],
custom: {
hub: {
// OptimismPortal
// https://docs.frax.com/fraxtal/addresses/fraxtal-contracts#ethereum-mainnet
// https://etherscan.io/address/0x36cb65c1967A0Fb0EEE11569C51C2f2aA1Ca6f6D#code
optimismPortal: "0x36cb65c1967A0Fb0EEE11569C51C2f2aA1Ca6f6D",
gasCap: DEFAULT_PROCESS_GAS,
},
spoke: {
gasCap: DEFAULT_PROCESS_GAS,
},
},
},
},
},
};
Loading