Fix TradeContractDTO types