Skip to content
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.

Sign up for GitHub

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

(1CT) Split txs for Ledger in swap review modal #3972

Merged
merged 5 commits into from
Nov 26, 2024
Merged

(1CT) Split txs for Ledger in swap review modal #3972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a878529
feat: split txs for Ledger
JoseRFelix Nov 26, 2024
56d31c0
fix: wrong override
JoseRFelix Nov 26, 2024
fcf421c
feat: default to non ledger behavior
JoseRFelix Nov 26, 2024
c4d257c
improvement: naming
JoseRFelix Nov 26, 2024
e1e4008
improvement: typos
JoseRFelix Nov 26, 2024
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
4 changes: 2 additions & 2 deletions packages/stores/src/account/base.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ export class AccountStore<Injects extends Record<string, any>[] = []> {
fee?: StdFee,
signOptions?: SignOptions,
onTxEvents?:
| ((tx: DeliverTxResponse) => void)
| ((tx: DeliverTxResponse) => void | Promise<void>)
| {
onBroadcastFailed?: (e?: Error) => void;
onBroadcasted?: (txHash: Uint8Array) => void;
Expand Down Expand Up @@ -709,7 +709,7 @@ export class AccountStore<Injects extends Record<string, any>[] = []> {
}

if (onFulfill) {
onFulfill(tx);
await onFulfill(tx);
}
} catch (e) {
const error = e as Error | AccountStoreNoBroadcastErrorEvent;
Expand Down
174 changes: 129 additions & 45 deletions packages/web/hooks/limit-orders/use-place-limit.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,11 +288,28 @@ export const usePlaceLimit = ({
const { oneClickMessages, isLoadingOneClickMessages, shouldSend1CTTx } =
use1CTSwapReviewMessages();

/**
* Default isLedger to true, just in case the wallet does
* not return the correct value
*/
const { value: isLedger } = useAsync(async () => {
const result = await account?.client?.getAccount?.(
accountStore.osmosisChainId
);
return result?.isNanoLedger ?? true;
// Disable deps to include account address in order to recompute the value as the others are memoized mobx values
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [account, account?.address, accountStore.osmosisChainId]);

const limitMessages = useMemo(() => {
if (isLedger) {
return encodedMsg && !isMarket ? [encodedMsg] : [];
}

return encodedMsg && !isMarket
? [encodedMsg, ...(oneClickMessages?.msgs ?? [])]
: [];
}, [encodedMsg, isMarket, oneClickMessages?.msgs]);
}, [encodedMsg, isLedger, isMarket, oneClickMessages?.msgs]);

const placeLimit = useCallback(async () => {
const quantity = paymentTokenValue?.toCoin().amount ?? "0";
Expand Down Expand Up @@ -375,50 +392,116 @@ export const usePlaceLimit = ({

try {
logEvent([EventName.LimitOrder.placeOrderStarted, baseEvent]);
await accountStore.signAndBroadcast(
accountStore.osmosisChainId,
"executeWasm",
limitMessages,
"",
undefined,
undefined,
(tx) => {
if (!tx.code) {
if (
shouldSend1CTTx &&
oneClickMessages &&
oneClickMessages.type === "create-1ct-session"
) {
onAdd1CTSession({
privateKey: oneClickMessages.key,
tx,
userOsmoAddress: account?.address ?? "",
fallbackGetAuthenticatorId:
apiUtils.local.oneClickTrading.getSessionAuthenticator.fetch,
accountStore,
allowedMessages: oneClickMessages.allowedMessages,
sessionPeriod: oneClickMessages.sessionPeriod,
spendLimitTokenDecimals:
oneClickMessages.spendLimitTokenDecimals,
transaction1CTParams: oneClickMessages.transaction1CTParams,
allowedAmount: oneClickMessages.allowedAmount,
t,
logEvent,
});
} else if (
shouldSend1CTTx &&
oneClickMessages &&
oneClickMessages.type === "remove-1ct-session"
) {
onEnd1CTSession({
accountStore,
authenticatorId: oneClickMessages.authenticatorId,
logEvent,
});
/**
* If it's ledger and we have one-click messages, we need to add a 1CT session
* before broadcasting the transaction as there is a payload limit on ledger
*/
if (
isLedger &&
oneClickMessages &&
oneClickMessages.msgs &&
shouldSend1CTTx
) {
await accountStore.signAndBroadcast(
accountStore.osmosisChainId,
"Add 1CT session",
oneClickMessages.msgs,
undefined,
undefined,
undefined,
async (tx) => {
const { code } = tx;
if (code) {
throw new Error("Failed to send swap exact amount in message");
} else {
if (
oneClickMessages &&
oneClickMessages.type === "create-1ct-session"
) {
await onAdd1CTSession({
privateKey: oneClickMessages.key,
tx,
userOsmoAddress: account?.address ?? "",
fallbackGetAuthenticatorId:
apiUtils.local.oneClickTrading.getSessionAuthenticator
.fetch,
accountStore,
allowedMessages: oneClickMessages.allowedMessages,
sessionPeriod: oneClickMessages.sessionPeriod,
spendLimitTokenDecimals:
oneClickMessages.spendLimitTokenDecimals,
transaction1CTParams: oneClickMessages.transaction1CTParams,
allowedAmount: oneClickMessages.allowedAmount,
t,
logEvent,
});
} else if (
shouldSend1CTTx &&
oneClickMessages &&
oneClickMessages.type === "remove-1ct-session"
) {
await onEnd1CTSession({
accountStore,
authenticatorId: oneClickMessages.authenticatorId,
logEvent,
});
}
}
}
}
);
);

await accountStore.signAndBroadcast(
accountStore.osmosisChainId,
"executeWasm",
limitMessages
);
} else {
await accountStore.signAndBroadcast(
accountStore.osmosisChainId,
"executeWasm",
limitMessages,
"",
undefined,
undefined,
(tx) => {
if (!tx.code) {
if (
shouldSend1CTTx &&
oneClickMessages &&
oneClickMessages.type === "create-1ct-session"
) {
onAdd1CTSession({
privateKey: oneClickMessages.key,
tx,
userOsmoAddress: account?.address ?? "",
fallbackGetAuthenticatorId:
apiUtils.local.oneClickTrading.getSessionAuthenticator
.fetch,
accountStore,
allowedMessages: oneClickMessages.allowedMessages,
sessionPeriod: oneClickMessages.sessionPeriod,
spendLimitTokenDecimals:
oneClickMessages.spendLimitTokenDecimals,
transaction1CTParams: oneClickMessages.transaction1CTParams,
allowedAmount: oneClickMessages.allowedAmount,
t,
logEvent,
});
} else if (
shouldSend1CTTx &&
oneClickMessages &&
oneClickMessages.type === "remove-1ct-session"
) {
onEnd1CTSession({
accountStore,
authenticatorId: oneClickMessages.authenticatorId,
logEvent,
});
}
}
}
);
}
logEvent([EventName.LimitOrder.placeOrderCompleted, baseEvent]);
} catch (error) {
console.error("Error attempting to broadcast place limit tx", error);
Expand All @@ -444,9 +527,10 @@ export const usePlaceLimit = ({
feeUsdValue,
marketState,
logEvent,
accountStore,
shouldSend1CTTx,
isLedger,
oneClickMessages,
shouldSend1CTTx,
accountStore,
account?.address,
apiUtils.local.oneClickTrading.getSessionAuthenticator.fetch,
t,
Expand Down
Loading
Loading