fix: limit order redemption

district-labs · Dec 12, 2024 · 1c3c14a · 1c3c14a
1 parent 634059c
commit 1c3c14a
Show file tree

Hide file tree

Showing 10 changed files with 62 additions and 57 deletions.
diff --git a/apps/api-delegations/src/db/actions/delegations/insert-delegation-db.ts b/apps/api-delegations/src/db/actions/delegations/insert-delegation-db.ts
@@ -16,7 +16,11 @@ export function insertDelegationDb({
 }: InsertDelegationDbParams) {
   return db.transaction(async (tx) => {
     // Insert the delegation
-    await tx.insert(delegationsDb).values(delegation).returning();
+    await tx
+      .insert(delegationsDb)
+      .values(delegation)
+      .returning()
+      .onConflictDoNothing();
 
     if (caveats.length > 0) {
       const caveatsWithDelegationHash = caveats.map((caveat) => ({
@@ -25,7 +29,11 @@ export function insertDelegationDb({
       }));
 
       // Insert the caveats
-      await tx.insert(caveatsDb).values(caveatsWithDelegationHash).returning();
+      await tx
+        .insert(caveatsDb)
+        .values(caveatsWithDelegationHash)
+        .returning()
+        .onConflictDoNothing();
     }
   });
 }
diff --git a/apps/api-delegations/src/processing/limit-order/index.ts b/apps/api-delegations/src/processing/limit-order/index.ts
@@ -2,6 +2,7 @@ import type { Delegation, DelegationExecution } from 'universal-types';
 import {
   decodeEnforcerERC20TransferAmount,
   encodeDelegation,
+  encodeExternalCallEnforcerArgs,
   encodeSingleExecution,
   getErc20TransferAmountEnforcerFromDelegation,
   getExternalHookEnforcerFromDelegation,
@@ -26,7 +27,6 @@ function getDepositAaveV3HookData({
 }: { amount: bigint; delegator: Address; token: Address }): Hex {
   return encodeFunctionData({
     abi: multicallAbi,
-
     functionName: 'multicall',
     args: [
       [
@@ -71,10 +71,13 @@ export async function processLimitOrderDelegation({
   delegation.caveats[externalHookEnforcerIndex] = {
     ...externalHookEnforcer,
     // Update the args of the external hook enforcer to include the data for the Aave V3 deposit
-    args: getDepositAaveV3HookData({
-      amount,
-      token,
-      delegator: delegation.delegator,
+    args: encodeExternalCallEnforcerArgs({
+      target: universalDeployments.Multicall,
+      callData: getDepositAaveV3HookData({
+        amount,
+        token,
+        delegator: delegation.delegator,
+      }),
     }),
   };
 

diff --git a/apps/api-delegations/src/processing/limit-order/utils.ts b/apps/api-delegations/src/processing/limit-order/utils.ts
@@ -138,3 +138,15 @@ export function encodeDelegation(delegation: Delegation): Hex {
     [[delegation]],
   );
 }
+
+export type EncodeExternalHookArgsParams = {
+  target: Address;
+  callData: Hex;
+};
+
+export function encodeExternalCallEnforcerArgs({
+  target,
+  callData,
+}: EncodeExternalHookArgsParams) {
+  return encodePacked(['address', 'bytes'], [target, callData]);
+}
diff --git a/apps/api-delegations/src/routes/delegations.ts b/apps/api-delegations/src/routes/delegations.ts
@@ -63,7 +63,10 @@ const delegationsRouter = new Hono()
       try {
         await Promise.all([
           // Process any necessary delegation side effects
-          processDelegation(delegation),
+          processDelegation({
+            chainId: delegation.chainId,
+            delegation,
+          }),
           // Save the delegation to the database
           insertDelegationDb(delegation),
         ]);

diff --git a/apps/wallet/src/components/forms/form-erc20-swap.tsx b/apps/wallet/src/components/forms/form-erc20-swap.tsx
@@ -12,7 +12,6 @@ import { useSignErc20SwapDelegation } from 'universal-delegations-sdk';
 import type { TokenItem } from 'universal-types';
 import type { Address } from 'viem';
 import { useAccount, useSwitchChain } from 'wagmi';
-import { useWriteContracts } from 'wagmi/experimental';
 import { z } from 'zod';
 
 const formSchema = z.object({
@@ -40,9 +39,7 @@ type FormErc20SwapProps = {
 function FormErc20Swap({ defaultValues }: FormErc20SwapProps) {
   const { address } = useAccount();
   const { switchChain, isPending: isPendingSwitchChain } = useSwitchChain();
-  const { signAndSaveDelegationAsync, isSuccess } =
-    useSignErc20SwapDelegation();
-  const { writeContracts } = useWriteContracts();
+  const { signAndSaveDelegationAsync } = useSignErc20SwapDelegation();
 
   const { isValidChain, chainId, defaultChain } = useIsValidChain();
 

diff --git a/packages/universal-delegations-sdk/src/actions/use-sign-erc20-swap.ts b/packages/universal-delegations-sdk/src/actions/use-sign-erc20-swap.ts
@@ -8,7 +8,7 @@ import { useInsertDelegation } from '../api/actions/insert-delegation.js';
 import { eip712DelegationTypes } from '../delegation/eip712-delegation-type.js';
 import { getDelegationHash } from '../delegation/get-delegation-hash.js';
 import { encodeEnforcerERC20TransferAmount } from '../enforcers/enforcer-erc20-transfer-amount.js';
-import { encodeERC20BalanceGteWrapEnforcerTerms } from '../enforcers/erc20-balance-gte-wrap-enforcer.js';
+// import { encodeERC20BalanceGteWrapEnforcerTerms } from '../enforcers/erc20-balance-gte-wrap-enforcer.js';
 
 type SignDelegationParams = {
   chainId: number;
@@ -37,9 +37,9 @@ export function useSignErc20SwapDelegation() {
     tokenOut = zeroAddress,
     decimalsOut = 18,
     amountOut = '0',
-    tokenIn = zeroAddress,
-    decimalsIn = 18,
-    amountIn = '0',
+    // tokenIn = zeroAddress,
+    // decimalsIn = 18,
+    // amountIn = '0',
   }: SignDelegationParams) {
     const signature = await signTypedDataAsync({
       types: eip712DelegationTypes,
@@ -56,14 +56,13 @@ export function useSignErc20SwapDelegation() {
         authority: ROOT_AUTHORITY,
         salt: salt,
         caveats: [
-          {
-            enforcer: universalDeployments.ERC20BalanceGteWrapEnforcer,
-            terms: encodeERC20BalanceGteWrapEnforcerTerms({
-              token: tokenIn,
-              amount: amountIn,
-              decimals: decimalsIn,
-            }),
-          },
+          // {
+          //   enforcer: universalDeployments.ERC20BalanceGteWrapEnforcer,
+          //   terms: encodeERC20BalanceGteWrapEnforcerTerms({
+          //     token: tokenIn,
+          //     amount: parseUnits(amountIn, decimalsIn),
+          //   }),
+          // },
           {
             enforcer: universalDeployments.ERC20TransferAmountEnforcer,
             terms: encodeEnforcerERC20TransferAmount({
@@ -87,15 +86,14 @@ export function useSignErc20SwapDelegation() {
       salt,
       signature,
       caveats: [
-        {
-          enforcer: universalDeployments.ERC20BalanceGteWrapEnforcer,
-          terms: encodeERC20BalanceGteWrapEnforcerTerms({
-            token: tokenIn,
-            amount: amountIn,
-            decimals: decimalsIn,
-          }),
-          args: '0x',
-        },
+        // {
+        //   enforcer: universalDeployments.ERC20BalanceGteWrapEnforcer,
+        //   terms: encodeERC20BalanceGteWrapEnforcerTerms({
+        //     token: tokenIn,
+        //     amount: parseUnits(amountIn, decimalsIn),
+        //   }),
+        //   args: '0x',
+        // },
         {
           enforcer: universalDeployments.ERC20TransferAmountEnforcer,
           terms: encodeEnforcerERC20TransferAmount({

diff --git a/...k/src/enforcers/enforcer-external-hook.ts → ...k/src/enforcers/enforcer-external-call.ts b/...k/src/enforcers/enforcer-external-hook.ts → ...k/src/enforcers/enforcer-external-call.ts
@@ -5,7 +5,7 @@ export type EncodeExternalHookArgsParams = {
   callData: Hex;
 };
 
-export function encodeExternalHookArgs({
+export function encodeExternalCallEnforcerArgs({
   target,
   callData,
 }: EncodeExternalHookArgsParams) {

diff --git a/packages/universal-delegations-sdk/src/enforcers/erc20-balance-gte-wrap-enforcer.ts b/packages/universal-delegations-sdk/src/enforcers/erc20-balance-gte-wrap-enforcer.ts
@@ -3,19 +3,17 @@ import {
   type Hex,
   encodePacked,
   hexToBigInt,
-  parseUnits,
   sliceHex,
 } from 'viem';
 
-export function encodeERC20BalanceGteWrapEnforcerTerms(data: {
+export function encodeERC20BalanceGteWrapEnforcerTerms({
+  amount,
+  token,
+}: {
+  amount: bigint;
   token: Address;
-  amount: string;
-  decimals: number;
 }) {
-  return encodePacked(
-    ['address', 'uint256'],
-    [data.token, parseUnits(data.amount, data.decimals)],
-  );
+  return encodePacked(['address', 'uint256'], [token, amount]);
 }
 
 export function decodeERC20BalanceGteWrapEnforcerTerms(data: Hex) {

diff --git a/packages/universal-delegations-sdk/src/enforcers/external-call-enforcer.ts b/packages/universal-delegations-sdk/src/enforcers/external-call-enforcer.ts
diff --git a/packages/universal-delegations-sdk/src/exports/index.ts b/packages/universal-delegations-sdk/src/exports/index.ts
@@ -29,7 +29,7 @@ export {
   encodeEnforcerERC20TransferAmount,
   getErc20TransferAmountEnforcerFromDelegation,
 } from '../enforcers/enforcer-erc20-transfer-amount.js';
-export { encodeExternalHookArgs } from '../enforcers/enforcer-external-hook.js';
+export { encodeExternalCallEnforcerArgs } from '../enforcers/enforcer-external-call.js';
 export { eip712DelegationTypes } from '../delegation/eip712-delegation-type.js';
 export { encodeDelegation } from '../delegation/encode-delegation.js';
 export {
@@ -41,6 +41,5 @@ export {
   decodeERC20BalanceGteWrapEnforcerTerms,
   encodeERC20BalanceGteWrapEnforcerTerms,
 } from '../enforcers/erc20-balance-gte-wrap-enforcer.js';
-export { encodeExternalHookEnforcerArgs } from '../enforcers/external-call-enforcer.js';
 export { encodeBatchExecution } from '../execution/encode-batch-execution.js';
 export { encodeSingleExecution } from '../execution/encode-single-execution.js';