Skip to content

Jw/layerzero types #752

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 5 commits into
base: staging
Choose a base branch
from
Draft
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
112 changes: 108 additions & 4 deletions packages/client/src/types/converters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,11 @@ import {
StargateTransferInfoJSON,
StargateTransferTransactionsJSON,
StargateTransferTransactions,
} from "./lifecycle";
LayerZeroTransferTransactions,
LayerZeroTransferTransactionsJSON,
LayerZeroTransferInfo,
LayerZeroTransferInfoJSON,
} from './lifecycle';
import {
Chain,
ChainJSON,
Expand Down Expand Up @@ -135,7 +139,9 @@ import {
GoFastFeeJSON,
StargateTransferJSON,
StargateTransfer,
} from "./shared";
LayerZeroTransferJSON,
LayerZeroTransfer,
} from './shared';
import {
AssetBetweenChains,
AssetBetweenChainsJSON,
Expand Down Expand Up @@ -928,6 +934,36 @@ export function stargateTransferToJSON(
};
}

export function layerZeroTransferFromJSON(layerZeroTransferJSON: LayerZeroTransferJSON): LayerZeroTransfer {
return {
fromChainID: layerZeroTransferJSON.from_chain_id,
toChainID: layerZeroTransferJSON.to_chain_id,
denomIn: layerZeroTransferJSON.denom_in,
denomOut: layerZeroTransferJSON.denom_out,
sourceOFTContractAddress: layerZeroTransferJSON.source_oft_contract_address,
destinationEndpointID: layerZeroTransferJSON.destination_endpoint_id,
messagingFeeAsset: assetFromJSON(layerZeroTransferJSON.messaging_fee_asset),
messagingFeeAmount: layerZeroTransferJSON.messaging_fee_amount,
messagingFeeAmountUSD: layerZeroTransferJSON.messaging_fee_amount_usd,
bridgeID: layerZeroTransferJSON.bridge_id,
}
}

export function layerZeroTransferToJSON(layerZeroTransfer: LayerZeroTransfer): LayerZeroTransferJSON {
return {
from_chain_id: layerZeroTransfer.fromChainID,
to_chain_id: layerZeroTransfer.toChainID,
denom_in: layerZeroTransfer.denomIn,
denom_out: layerZeroTransfer.denomOut,
source_oft_contract_address: layerZeroTransfer.sourceOFTContractAddress,
destination_endpoint_id: layerZeroTransfer.destinationEndpointID,
messaging_fee_asset: assetToJSON(layerZeroTransfer.messagingFeeAsset),
messaging_fee_amount: layerZeroTransfer.messagingFeeAmount,
messaging_fee_amount_usd: layerZeroTransfer.messagingFeeAmountUSD,
bridge_id: layerZeroTransfer.bridgeID,
}
}

export function operationFromJSON(operationJSON: OperationJSON): Operation {
const commonProps = {
txIndex: operationJSON.tx_index,
Expand Down Expand Up @@ -995,7 +1031,14 @@ export function operationFromJSON(operationJSON: OperationJSON): Operation {
};
}

if ("swap" in operationJSON) {
if ('layer_zero_transfer' in operationJSON) {
return {
...commonProps,
layerZeroTransfer: layerZeroTransferFromJSON(operationJSON.layer_zero_transfer),
};
}

if ('swap' in operationJSON) {
return {
...commonProps,
swap: swapFromJSON(operationJSON.swap),
Expand Down Expand Up @@ -1075,7 +1118,14 @@ export function operationToJSON(operation: Operation): OperationJSON {
};
}

if ("swap" in operation) {
if ('layerZeroTransfer' in operation) {
return {
...commonProps,
layer_zero_transfer: layerZeroTransferToJSON(operation.layerZeroTransfer),
};
}

if ('swap' in operation) {
return {
...commonProps,
swap: swapToJSON(operation.swap),
Expand Down Expand Up @@ -2099,6 +2149,12 @@ export function transferEventFromJSON(value: TransferEventJSON): TransferEvent {
};
}

if ('layer_zero_transfer' in value) {
return {
layerZeroTransfer: layerZeroTransferInfoFromJSON(value.layer_zero_transfer),
};
}

return {
axelarTransfer: axelarTransferInfoFromJSON(value.axelar_transfer),
};
Expand Down Expand Up @@ -2140,6 +2196,12 @@ export function transferEventToJSON(value: TransferEvent): TransferEventJSON {
};
}

if ('layerZeroTransfer' in value) {
return {
layer_zero_transfer: layerZeroTransferInfoToJSON(value.layerZeroTransfer),
};
}

return {
axelar_transfer: axelarTransferInfoToJSON(value.axelarTransfer),
};
Expand Down Expand Up @@ -2531,6 +2593,48 @@ export function stargateTransferTransactionsToJSON(
};
}

export function layerZeroTransferTransactionsFromJSON(
value: LayerZeroTransferTransactionsJSON
): LayerZeroTransferTransactions {
return {
sendTx: value.send_tx ? chainTransactionFromJSON(value.send_tx) : null,
receiveTx: value.receive_tx ? chainTransactionFromJSON(value.receive_tx) : null,
errorTx: value.error_tx ? chainTransactionFromJSON(value.error_tx) : null,
};
}

export function layerZeroTransferTransactionsToJSON(
value: LayerZeroTransferTransactions
): LayerZeroTransferTransactionsJSON {
return {
send_tx: value.sendTx ? chainTransactionToJSON(value.sendTx) : null,
receive_tx: value.receiveTx ? chainTransactionToJSON(value.receiveTx) : null,
error_tx: value.errorTx ? chainTransactionToJSON(value.errorTx) : null,
};
}

export function layerZeroTransferInfoFromJSON(
value: LayerZeroTransferInfoJSON
): LayerZeroTransferInfo {
return {
fromChainID: value.from_chain_id,
toChainID: value.to_chain_id,
state: value.state,
txs: value.txs && layerZeroTransferTransactionsFromJSON(value.txs),
};
}

export function layerZeroTransferInfoToJSON(
value: LayerZeroTransferInfo
): LayerZeroTransferInfoJSON {
return {
from_chain_id: value.fromChainID,
to_chain_id: value.toChainID,
state: value.state,
txs: value.txs && layerZeroTransferTransactionsToJSON(value.txs),
};
}

export function opInitTransferInfoFromJSON(
value: OPInitTransferInfoJSON,
): OPInitTransferInfo {
Expand Down
38 changes: 36 additions & 2 deletions packages/client/src/types/lifecycle.ts
Original file line number Diff line number Diff line change
Expand Up @@ -472,6 +472,38 @@ export type StargateTransferInfo = {
txs: StargateTransferTransactions;
};

export type LayerZeroTransferState =
| 'LAYER_ZERO_TRANSFER_UNKNOWN'
| 'LAYER_ZERO_TRANSFER_SENT'
| 'LAYER_ZERO_TRANSFER_RECEIVED'
| 'LAYER_ZERO_TRANSFER_FAILED';

export type LayerZeroTransferTransactionsJSON = {
send_tx: ChainTransactionJSON | null;
receive_tx: ChainTransactionJSON | null;
error_tx: ChainTransactionJSON | null;
};

export type LayerZeroTransferTransactions = {
sendTx: ChainTransaction | null;
receiveTx: ChainTransaction | null;
errorTx: ChainTransaction | null;
};

export type LayerZeroTransferInfoJSON = {
from_chain_id: string;
to_chain_id: string;
state: LayerZeroTransferState;
txs: LayerZeroTransferTransactionsJSON;
};

export type LayerZeroTransferInfo = {
fromChainID: string;
toChainID: string;
state: LayerZeroTransferState;
txs: LayerZeroTransferTransactions;
};

export type OPInitTransferState =
| 'OPINIT_TRANSFER_UNKNOWN'
| 'OPINIT_TRANSFER_SENT'
Expand Down Expand Up @@ -513,7 +545,8 @@ export type TransferEventJSON =
| { hyperlane_transfer: HyperlaneTransferInfoJSON }
| { op_init_transfer: OPInitTransferInfoJSON }
| { go_fast_transfer: GoFastTransferInfoJSON }
| { stargate_transfer: StargateTransferInfoJSON };
| { stargate_transfer: StargateTransferInfoJSON }
| { layer_zero_transfer: LayerZeroTransferInfoJSON };

export type TransferEvent =
| {
Expand All @@ -524,7 +557,8 @@ export type TransferEvent =
| { hyperlaneTransfer: HyperlaneTransferInfo }
| { opInitTransfer: OPInitTransferInfo }
| { goFastTransfer: GoFastTransferInfo }
| { stargateTransfer: StargateTransferInfo };
| { stargateTransfer: StargateTransferInfo }
| { layerZeroTransfer: LayerZeroTransferInfo };

type CallbackStatus = 'success' | 'error' | 'pending' | 'completed';
export interface TransactionCallbacks {
Expand Down
32 changes: 32 additions & 0 deletions packages/client/src/types/shared.ts
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,38 @@ export type StargateTransfer = {
bridgeID: BridgeType;
};

export type LayerZeroTransferJSON = {
from_chain_id: string;
to_chain_id: string;
denom_in: string;
denom_out: string;

source_oft_contract_address: string;
destination_endpoint_id: number;

messaging_fee_asset: AssetJSON;
messaging_fee_amount: string;
messaging_fee_amount_usd: string;

bridge_id: BridgeType;
};

export type LayerZeroTransfer = {
fromChainID: string;
toChainID: string;
denomIn: string;
denomOut: string;

sourceOFTContractAddress: string;
destinationEndpointID: number;

messagingFeeAsset: Asset;
messagingFeeAmount: string;
messagingFeeAmountUSD: string;

bridgeID: BridgeType;
};

export type BankSendJSON = {
chain_id: string;
denom: string;
Expand Down
10 changes: 7 additions & 3 deletions packages/client/src/types/unified.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@ import {
ChainAffiliates,
StargateTransferJSON,
StargateTransfer,
} from "./shared";
LayerZeroTransferJSON,
LayerZeroTransfer,
} from './shared';

export type AssetsRequestJSON = {
chain_ids?: string[];
Expand Down Expand Up @@ -292,7 +294,8 @@ export type OperationJSON =
| (BaseOperationJSON & { evm_swap: EvmSwapJSON })
| (BaseOperationJSON & { op_init_transfer: OPInitTransferJSON })
| (BaseOperationJSON & { go_fast_transfer: GoFastTransferJSON })
| (BaseOperationJSON & { stargate_transfer: StargateTransferJSON });
| (BaseOperationJSON & { stargate_transfer: StargateTransferJSON })
| (BaseOperationJSON & { layer_zero_transfer: LayerZeroTransferJSON });

interface BaseOperation {
txIndex: number;
Expand All @@ -310,7 +313,8 @@ export type Operation =
| (BaseOperation & { evmSwap: EvmSwap })
| (BaseOperation & { opInitTransfer: OPInitTransfer })
| (BaseOperation & { goFastTransfer: GoFastTransfer })
| (BaseOperation & { stargateTransfer: StargateTransfer });
| (BaseOperation & { stargateTransfer: StargateTransfer })
| (BaseOperation & { layerZeroTransfer: LayerZeroTransfer });

export type RouteResponseJSON = {
source_asset_denom: string;
Expand Down
2 changes: 1 addition & 1 deletion packages/widget/src/state/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ type CaughtRouteError = {
};

export const routeConfigAtom = atom<WidgetRouteConfig>({
experimentalFeatures: ["hyperlane", "stargate"],
experimentalFeatures: ["hyperlane", "stargate", "layer_zero"],
allowMultiTx: true,
allowUnsafe: true,
smartSwapOptions: {
Expand Down
2 changes: 1 addition & 1 deletion vendor/noble-cctp
Submodule noble-cctp updated 298 files