Remove validation of fullFeeAmount

safe-global · Jan 14, 2025 · 4bb4a69 · 4bb4a69
1 parent f9259e5
commit 4bb4a69
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 24 deletions.
diff --git a/src/domain/swaps/entities/__tests__/order.builder.ts b/src/domain/swaps/entities/__tests__/order.builder.ts
@@ -87,7 +87,6 @@ export function orderBuilder(): IBuilder<Order> {
     .with('executedFeeAmount', faker.number.bigInt({ min: 1 }))
     .with('invalidated', faker.datatype.boolean())
     .with('status', faker.helpers.arrayElement(Object.values(OrderStatus)))
-    .with('fullFeeAmount', faker.number.bigInt({ min: 1 }))
     .with('isLiquidityOrder', faker.datatype.boolean())
     .with(
       'ethflowData',

diff --git a/src/domain/swaps/entities/order.entity.ts b/src/domain/swaps/entities/order.entity.ts
@@ -74,7 +74,6 @@ export const OrderSchema = z.object({
   executedFeeAmount: z.coerce.bigint(),
   invalidated: z.boolean(),
   status: z.nativeEnum(OrderStatus).catch(OrderStatus.Unknown),
-  fullFeeAmount: z.coerce.bigint(),
   isLiquidityOrder: z.boolean(),
   ethflowData: z
     .object({

diff --git a/src/domain/swaps/swaps.repository.e2e-spec.ts b/src/domain/swaps/swaps.repository.e2e-spec.ts
@@ -33,7 +33,6 @@ const orderIds = {
         from: null,
         fullAppData:
           '{"version":"0.4.0","appCode":"DefiLlama","environment":"production","metadata":{"referrer":{"version":"0.1.0","address":"0x08a3c2A819E3de7ACa384c798269B3Ce1CD0e437"}}}',
-        fullFeeAmount: BigInt('0'),
         invalidated: false,
         isLiquidityOrder: false,
         kind: 'sell',
@@ -78,7 +77,6 @@ const orderIds = {
         from: null,
         fullAppData:
           '{"appCode":"CoW Swap","environment":"production","metadata":{"orderClass":{"orderClass":"market"},"quote":{"slippageBips":"200"}},"version":"0.11.0"}',
-        fullFeeAmount: BigInt('0'),
         invalidated: false,
         isLiquidityOrder: false,
         kind: 'sell',

diff --git a/src/routes/transactions/helpers/swap-order.helper.spec.ts b/src/routes/transactions/helpers/swap-order.helper.spec.ts
@@ -105,7 +105,6 @@ describe('Swap Order Helper tests', () => {
         feeAmount: order.feeAmount,
         from: order.from,
         fullAppData: order.fullAppData,
-        fullFeeAmount: order.fullFeeAmount,
         invalidated: order.invalidated,
         isLiquidityOrder: order.isLiquidityOrder,
         kind: order.kind,

diff --git a/src/routes/transactions/mappers/common/twap-order.mapper.spec.ts b/src/routes/transactions/mappers/common/twap-order.mapper.spec.ts
@@ -217,7 +217,6 @@ describe('TwapOrderMapper', () => {
       status: 'fulfilled',
       class: 'limit',
       settlementContract: '0x9008d19f58aabd9ed0d60971565aa8510560ab41',
-      fullFeeAmount: '0',
       solverFee: '0',
       isLiquidityOrder: false,
       fullAppData:
@@ -257,7 +256,7 @@ describe('TwapOrderMapper', () => {
       status: 'fulfilled',
       class: 'limit',
       settlementContract: '0x9008d19f58aabd9ed0d60971565aa8510560ab41',
-      fullFeeAmount: '0',
+
       solverFee: '0',
       isLiquidityOrder: false,
       fullAppData:
@@ -396,7 +395,6 @@ describe('TwapOrderMapper', () => {
       status: 'fulfilled',
       class: 'limit',
       settlementContract: '0x9008d19f58aabd9ed0d60971565aa8510560ab41',
-      fullFeeAmount: '0',
       solverFee: '0',
       isLiquidityOrder: false,
       fullAppData:
@@ -629,7 +627,6 @@ describe('TwapOrderMapper', () => {
       status: 'fulfilled',
       class: 'limit',
       settlementContract: '0x9008d19f58aabd9ed0d60971565aa8510560ab41',
-      fullFeeAmount: '0',
       solverFee: '0',
       isLiquidityOrder: false,
       fullAppData: JSON.parse(
@@ -729,7 +726,6 @@ describe('TwapOrderMapper', () => {
       status: 'fulfilled',
       class: 'limit',
       settlementContract: '0x9008d19f58aabd9ed0d60971565aa8510560ab41',
-      fullFeeAmount: '0',
       solverFee: '0',
       isLiquidityOrder: false,
       fullAppData: JSON.parse(
@@ -935,7 +931,6 @@ describe('TwapOrderMapper', () => {
           status: 'open',
           class: 'limit',
           settlementContract: '0x9008d19f58aabd9ed0d60971565aa8510560ab41',
-          fullFeeAmount: '0',
           solverFee: '0',
           isLiquidityOrder: false,
           fullAppData:
@@ -1054,7 +1049,6 @@ describe('TwapOrderMapper', () => {
           status: 'fulfilled',
           class: 'limit',
           settlementContract: '0x9008d19f58aabd9ed0d60971565aa8510560ab41',
-          fullFeeAmount: '0',
           solverFee: '0',
           isLiquidityOrder: false,
           fullAppData:
@@ -1173,7 +1167,6 @@ describe('TwapOrderMapper', () => {
           status: 'fulfilled',
           class: 'limit',
           settlementContract: '0x9008d19f58aabd9ed0d60971565aa8510560ab41',
-          fullFeeAmount: '0',
           solverFee: '0',
           isLiquidityOrder: false,
           fullAppData:
@@ -1213,7 +1206,6 @@ describe('TwapOrderMapper', () => {
           status: 'fulfilled',
           class: 'limit',
           settlementContract: '0x9008d19f58aabd9ed0d60971565aa8510560ab41',
-          fullFeeAmount: '0',
           solverFee: '0',
           isLiquidityOrder: false,
           fullAppData:
@@ -1335,7 +1327,6 @@ describe('TwapOrderMapper', () => {
           status: 'fulfilled',
           class: 'limit',
           settlementContract: '0x9008d19f58aabd9ed0d60971565aa8510560ab41',
-          fullFeeAmount: '0',
           solverFee: '0',
           isLiquidityOrder: false,
           fullAppData:
@@ -1375,7 +1366,6 @@ describe('TwapOrderMapper', () => {
           status: 'fulfilled',
           class: 'limit',
           settlementContract: '0x9008d19f58aabd9ed0d60971565aa8510560ab41',
-          fullFeeAmount: '0',
           solverFee: '0',
           isLiquidityOrder: false,
           fullAppData:
@@ -1416,7 +1406,6 @@ describe('TwapOrderMapper', () => {
           status: 'open',
           class: 'limit',
           settlementContract: '0x9008d19f58aabd9ed0d60971565aa8510560ab41',
-          fullFeeAmount: '0',
           solverFee: '0',
           isLiquidityOrder: false,
           fullAppData:
@@ -1535,7 +1524,6 @@ describe('TwapOrderMapper', () => {
           status: 'fulfilled',
           class: 'limit',
           settlementContract: '0x9008d19f58aabd9ed0d60971565aa8510560ab41',
-          fullFeeAmount: '0',
           solverFee: '0',
           isLiquidityOrder: false,
           fullAppData:
@@ -1575,7 +1563,6 @@ describe('TwapOrderMapper', () => {
           status: 'fulfilled',
           class: 'limit',
           settlementContract: '0x9008d19f58aabd9ed0d60971565aa8510560ab41',
-          fullFeeAmount: '0',
           solverFee: '0',
           isLiquidityOrder: false,
           fullAppData:
@@ -1615,7 +1602,6 @@ describe('TwapOrderMapper', () => {
           status: 'expired',
           class: 'limit',
           settlementContract: '0x9008d19f58aabd9ed0d60971565aa8510560ab41',
-          fullFeeAmount: '0',
           solverFee: '0',
           isLiquidityOrder: false,
           fullAppData:

diff --git a/src/routes/transactions/mappers/transfers/swap-transfer-info.mapper.spec.ts b/src/routes/transactions/mappers/transfers/swap-transfer-info.mapper.spec.ts
@@ -262,7 +262,6 @@ describe('SwapTransferInfoMapper', () => {
         status: 'fulfilled',
         class: 'limit',
         settlementContract: '0x9008d19f58aabd9ed0d60971565aa8510560ab41',
-        fullFeeAmount: '0',
         solverFee: '0',
         isLiquidityOrder: false,
         fullAppData:
@@ -299,7 +298,6 @@ describe('SwapTransferInfoMapper', () => {
         status: 'fulfilled',
         class: 'limit',
         settlementContract: '0x9008d19f58aabd9ed0d60971565aa8510560ab41',
-        fullFeeAmount: '0',
         solverFee: '0',
         isLiquidityOrder: false,
         fullAppData:
@@ -422,7 +420,6 @@ describe('SwapTransferInfoMapper', () => {
         status: 'fulfilled',
         class: 'limit',
         settlementContract: '0x9008d19f58aabd9ed0d60971565aa8510560ab41',
-        fullFeeAmount: '0',
         solverFee: '0',
         isLiquidityOrder: false,
         fullAppData:
@@ -459,7 +456,6 @@ describe('SwapTransferInfoMapper', () => {
         status: 'fulfilled',
         class: 'limit',
         settlementContract: '0x9008d19f58aabd9ed0d60971565aa8510560ab41',
-        fullFeeAmount: '0',
         solverFee: '0',
         isLiquidityOrder: false,
         fullAppData: