diff --git a/src/domain/swaps/entities/__tests__/order.builder.ts b/src/domain/swaps/entities/__tests__/order.builder.ts index cd8c478888..e6909aacbe 100644 --- 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 { .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 index 08abe57efb..e533680db4 100644 --- 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 index fc45a8c95b..b12e69d8bf 100644 --- 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 index bb28bb091c..e418fbd6c7 100644 --- 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 index b12abed9b2..b5d1ffed31 100644 --- a/src/routes/transactions/mappers/common/twap-order.mapper.spec.ts +++ b/src/routes/transactions/mappers/common/twap-order.mapper.spec.ts @@ -217,8 +217,6 @@ describe('TwapOrderMapper', () => { status: 'fulfilled', class: 'limit', settlementContract: '0x9008d19f58aabd9ed0d60971565aa8510560ab41', - fullFeeAmount: '0', - solverFee: '0', isLiquidityOrder: false, fullAppData: '{"appCode":"Safe Wallet Swaps","metadata":{"orderClass":{"orderClass":"twap"},"quote":{"slippageBips":1000},"widget":{"appCode":"CoW Swap-SafeApp","environment":"production"}},"version":"1.1.0"}', @@ -257,8 +255,6 @@ describe('TwapOrderMapper', () => { status: 'fulfilled', class: 'limit', settlementContract: '0x9008d19f58aabd9ed0d60971565aa8510560ab41', - fullFeeAmount: '0', - solverFee: '0', isLiquidityOrder: false, fullAppData: '{"appCode":"Safe Wallet Swaps","metadata":{"orderClass":{"orderClass":"twap"},"quote":{"slippageBips":1000},"widget":{"appCode":"CoW Swap-SafeApp","environment":"production"}},"version":"1.1.0"}', @@ -396,8 +392,6 @@ describe('TwapOrderMapper', () => { status: 'fulfilled', class: 'limit', settlementContract: '0x9008d19f58aabd9ed0d60971565aa8510560ab41', - fullFeeAmount: '0', - solverFee: '0', isLiquidityOrder: false, fullAppData: '{"appCode":"Safe Wallet Swaps","metadata":{"orderClass":{"orderClass":"twap"},"quote":{"slippageBips":1000},"widget":{"appCode":"CoW Swap-SafeApp","environment":"production"}},"version":"1.1.0"}', @@ -629,8 +623,6 @@ describe('TwapOrderMapper', () => { status: 'fulfilled', class: 'limit', settlementContract: '0x9008d19f58aabd9ed0d60971565aa8510560ab41', - fullFeeAmount: '0', - solverFee: '0', isLiquidityOrder: false, fullAppData: JSON.parse( '{"appCode":"Safe Wallet Swaps","metadata":{"orderClass":{"orderClass":"twap"},"quote":{"slippageBips":1000},"widget":{"appCode":"CoW Swap-SafeApp","environment":"production"}},"version":"1.1.0"}', @@ -729,8 +721,6 @@ describe('TwapOrderMapper', () => { status: 'fulfilled', class: 'limit', settlementContract: '0x9008d19f58aabd9ed0d60971565aa8510560ab41', - fullFeeAmount: '0', - solverFee: '0', isLiquidityOrder: false, fullAppData: JSON.parse( '{"appCode":"Safe Wallet Swaps","metadata":{"orderClass":{"orderClass":"twap"},"quote":{"slippageBips":1000},"widget":{"appCode":"CoW Swap-SafeApp","environment":"production"}},"version":"1.1.0"}', @@ -935,8 +925,6 @@ describe('TwapOrderMapper', () => { status: 'open', class: 'limit', settlementContract: '0x9008d19f58aabd9ed0d60971565aa8510560ab41', - fullFeeAmount: '0', - solverFee: '0', isLiquidityOrder: false, fullAppData: '{"appCode":"Safe Wallet Swaps","metadata":{"orderClass":{"orderClass":"twap"},"partnerFee":{"bps":35,"recipient":"0x63695Eee2c3141BDE314C5a6f89B98E62808d716"},"quote":{"slippageBips":1000},"widget":{"appCode":"CoW Swap-SafeApp","environment":"production"}},"version":"1.1.0"}', @@ -1054,8 +1042,6 @@ describe('TwapOrderMapper', () => { status: 'fulfilled', class: 'limit', settlementContract: '0x9008d19f58aabd9ed0d60971565aa8510560ab41', - fullFeeAmount: '0', - solverFee: '0', isLiquidityOrder: false, fullAppData: '{"appCode":"Safe Wallet Swaps","metadata":{"orderClass":{"orderClass":"twap"},"partnerFee":{"bps":35,"recipient":"0x63695Eee2c3141BDE314C5a6f89B98E62808d716"},"quote":{"slippageBips":1000},"widget":{"appCode":"CoW Swap-SafeApp","environment":"production"}},"version":"1.1.0"}', @@ -1173,8 +1159,6 @@ describe('TwapOrderMapper', () => { status: 'fulfilled', class: 'limit', settlementContract: '0x9008d19f58aabd9ed0d60971565aa8510560ab41', - fullFeeAmount: '0', - solverFee: '0', isLiquidityOrder: false, fullAppData: '{"appCode":"Safe Wallet Swaps","metadata":{"orderClass":{"orderClass":"twap"},"partnerFee":{"bps":35,"recipient":"0x63695Eee2c3141BDE314C5a6f89B98E62808d716"},"quote":{"slippageBips":1000},"widget":{"appCode":"CoW Swap-SafeApp","environment":"production"}},"version":"1.1.0"}', @@ -1213,8 +1197,6 @@ describe('TwapOrderMapper', () => { status: 'fulfilled', class: 'limit', settlementContract: '0x9008d19f58aabd9ed0d60971565aa8510560ab41', - fullFeeAmount: '0', - solverFee: '0', isLiquidityOrder: false, fullAppData: '{"appCode":"Safe Wallet Swaps","metadata":{"orderClass":{"orderClass":"twap"},"partnerFee":{"bps":35,"recipient":"0x63695Eee2c3141BDE314C5a6f89B98E62808d716"},"quote":{"slippageBips":1000},"widget":{"appCode":"CoW Swap-SafeApp","environment":"production"}},"version":"1.1.0"}', @@ -1335,8 +1317,6 @@ describe('TwapOrderMapper', () => { status: 'fulfilled', class: 'limit', settlementContract: '0x9008d19f58aabd9ed0d60971565aa8510560ab41', - fullFeeAmount: '0', - solverFee: '0', isLiquidityOrder: false, fullAppData: '{"appCode":"Safe Wallet Swaps","metadata":{"orderClass":{"orderClass":"twap"},"partnerFee":{"bps":35,"recipient":"0x63695Eee2c3141BDE314C5a6f89B98E62808d716"},"quote":{"slippageBips":1000},"widget":{"appCode":"CoW Swap-SafeApp","environment":"production"}},"version":"1.1.0"}', @@ -1375,8 +1355,6 @@ describe('TwapOrderMapper', () => { status: 'fulfilled', class: 'limit', settlementContract: '0x9008d19f58aabd9ed0d60971565aa8510560ab41', - fullFeeAmount: '0', - solverFee: '0', isLiquidityOrder: false, fullAppData: '{"appCode":"Safe Wallet Swaps","metadata":{"orderClass":{"orderClass":"twap"},"partnerFee":{"bps":35,"recipient":"0x63695Eee2c3141BDE314C5a6f89B98E62808d716"},"quote":{"slippageBips":1000},"widget":{"appCode":"CoW Swap-SafeApp","environment":"production"}},"version":"1.1.0"}', @@ -1416,8 +1394,6 @@ describe('TwapOrderMapper', () => { status: 'open', class: 'limit', settlementContract: '0x9008d19f58aabd9ed0d60971565aa8510560ab41', - fullFeeAmount: '0', - solverFee: '0', isLiquidityOrder: false, fullAppData: '{"appCode":"Safe Wallet Swaps","metadata":{"orderClass":{"orderClass":"twap"},"partnerFee":{"bps":35,"recipient":"0x63695Eee2c3141BDE314C5a6f89B98E62808d716"},"quote":{"slippageBips":1000},"widget":{"appCode":"CoW Swap-SafeApp","environment":"production"}},"version":"1.1.0"}', @@ -1535,8 +1511,6 @@ describe('TwapOrderMapper', () => { status: 'fulfilled', class: 'limit', settlementContract: '0x9008d19f58aabd9ed0d60971565aa8510560ab41', - fullFeeAmount: '0', - solverFee: '0', isLiquidityOrder: false, fullAppData: '{"appCode":"Safe Wallet Swaps","metadata":{"orderClass":{"orderClass":"twap"},"partnerFee":{"bps":35,"recipient":"0x63695Eee2c3141BDE314C5a6f89B98E62808d716"},"quote":{"slippageBips":1000},"widget":{"appCode":"CoW Swap-SafeApp","environment":"production"}},"version":"1.1.0"}', @@ -1575,8 +1549,6 @@ describe('TwapOrderMapper', () => { status: 'fulfilled', class: 'limit', settlementContract: '0x9008d19f58aabd9ed0d60971565aa8510560ab41', - fullFeeAmount: '0', - solverFee: '0', isLiquidityOrder: false, fullAppData: '{"appCode":"Safe Wallet Swaps","metadata":{"orderClass":{"orderClass":"twap"},"partnerFee":{"bps":35,"recipient":"0x63695Eee2c3141BDE314C5a6f89B98E62808d716"},"quote":{"slippageBips":1000},"widget":{"appCode":"CoW Swap-SafeApp","environment":"production"}},"version":"1.1.0"}', @@ -1615,8 +1587,6 @@ describe('TwapOrderMapper', () => { status: 'expired', class: 'limit', settlementContract: '0x9008d19f58aabd9ed0d60971565aa8510560ab41', - fullFeeAmount: '0', - solverFee: '0', isLiquidityOrder: false, fullAppData: '{"appCode":"Safe Wallet Swaps","metadata":{"orderClass":{"orderClass":"twap"},"partnerFee":{"bps":35,"recipient":"0x63695Eee2c3141BDE314C5a6f89B98E62808d716"},"quote":{"slippageBips":1000},"widget":{"appCode":"CoW Swap-SafeApp","environment":"production"}},"version":"1.1.0"}', 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 index dc27571796..50aaab65f2 100644 --- 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,8 +262,6 @@ describe('SwapTransferInfoMapper', () => { status: 'fulfilled', class: 'limit', settlementContract: '0x9008d19f58aabd9ed0d60971565aa8510560ab41', - fullFeeAmount: '0', - solverFee: '0', isLiquidityOrder: false, fullAppData: '{"appCode":"CoW Swap","environment":"production","metadata":{"orderClass":{"orderClass":"market"},"quote":{"slippageBips":50},"utm":{"utmContent":"header-cta-button","utmMedium":"web","utmSource":"cow.fi"}},"version":"1.1.0"}', @@ -299,8 +297,6 @@ describe('SwapTransferInfoMapper', () => { status: 'fulfilled', class: 'limit', settlementContract: '0x9008d19f58aabd9ed0d60971565aa8510560ab41', - fullFeeAmount: '0', - solverFee: '0', isLiquidityOrder: false, fullAppData: '{"appCode":"CoW Swap","environment":"production","metadata":{"orderClass":{"orderClass":"market"},"quote":{"slippageBips":50},"utm":{"utmContent":"header-cta-button","utmMedium":"web","utmSource":"cow.fi"}},"version":"1.1.0"}', @@ -422,8 +418,6 @@ describe('SwapTransferInfoMapper', () => { status: 'fulfilled', class: 'limit', settlementContract: '0x9008d19f58aabd9ed0d60971565aa8510560ab41', - fullFeeAmount: '0', - solverFee: '0', isLiquidityOrder: false, fullAppData: '{"appCode":"CoW Swap","environment":"production","metadata":{"orderClass":{"orderClass":"market"},"quote":{"slippageBips":50},"utm":{"utmContent":"header-cta-button","utmMedium":"web","utmSource":"cow.fi"}},"version":"1.1.0"}', @@ -459,8 +453,6 @@ describe('SwapTransferInfoMapper', () => { status: 'fulfilled', class: 'limit', settlementContract: '0x9008d19f58aabd9ed0d60971565aa8510560ab41', - fullFeeAmount: '0', - solverFee: '0', isLiquidityOrder: false, fullAppData: '{"appCode":"CoW Swap","environment":"production","metadata":{"orderClass":{"orderClass":"market"},"quote":{"slippageBips":50},"utm":{"utmContent":"header-cta-button","utmMedium":"web","utmSource":"cow.fi"}},"version":"1.1.0"}',